summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2004-01-17 13:00:38 (GMT)
committerfoobar <sniper@php.net>2004-01-17 13:00:38 (GMT)
commitf4983c0d3f56c2074458e4840db36643b2fec59b (patch)
tree2dcf521f07114e3bb2952439fe28cdfa40d30677
parentb851f3712388de9f6c4addf2063dbc3c663a0b3b (diff)
downloadphp-f4983c0d3f56c2074458e4840db36643b2fec59b.tar.gz
- Renamed all *php4* files to *php5*, changed all php4/PHP4 to php5/PHP5
-rw-r--r--ChangeLog8
-rw-r--r--README.PHP4-TO-PHP5-THIN-CHANGES2
-rw-r--r--README.Zeus2
-rwxr-xr-xZend/tests/bug26802.phpt4
-rw-r--r--configure.in2
-rw-r--r--ext/bz2/bz2.dsp4
-rw-r--r--ext/com_dotnet/README8
-rw-r--r--ext/cpdf/cpdf.dsp8
-rw-r--r--ext/ctype/ctype.dsp4
-rw-r--r--ext/curl/curl.dsp16
-rw-r--r--ext/dba/dba.dsp8
-rw-r--r--ext/dbase/dbase.dsp8
-rw-r--r--ext/dbx/dbx.dsp8
-rw-r--r--ext/dio/tests/001.phpt2
-rw-r--r--ext/dom/dom.dsp8
-rw-r--r--ext/exif/exif.dsp8
-rw-r--r--ext/fbsql/fbsql.dsp8
-rw-r--r--ext/fdf/fdf.dsp8
-rw-r--r--ext/filepro/filepro.dsp8
-rw-r--r--ext/gd/gd.dsp8
-rw-r--r--ext/gettext/gettext.dsp8
-rw-r--r--ext/gmp/tests/001.phpt2
-rw-r--r--ext/iconv/iconv.dsp4
-rw-r--r--ext/imap/imap.dsp8
-rw-r--r--ext/informix/ifx.dsp4
-rw-r--r--ext/informix/ifx.ec2
-rw-r--r--ext/ingres_ii/README4
-rw-r--r--ext/ingres_ii/ingres.dsp4
-rw-r--r--ext/interbase/interbase.dsp8
-rw-r--r--ext/ldap/LDAP_Win32_HOWTO.txt2
-rw-r--r--ext/ldap/ldap.dsp28
-rw-r--r--ext/ldap/ldap.mak2
-rw-r--r--ext/mbstring/mbstring.c2
-rw-r--r--ext/mbstring/mbstring.dsp8
-rw-r--r--ext/mbstring/mbstring.h2
-rw-r--r--ext/mcrypt/mcrypt.dsp8
-rw-r--r--ext/mcve/config.m42
-rw-r--r--ext/mcve/mcve.dsp4
-rw-r--r--ext/mcve/tests/001.phpt2
-rw-r--r--ext/mhash/mhash.dsp8
-rw-r--r--ext/mime_magic/mime_magic.dsp4
-rw-r--r--ext/ming/ming.dsp4
-rw-r--r--ext/mnogosearch/README2
-rw-r--r--ext/mnogosearch/index.php2
-rw-r--r--ext/msql/msql.dsp4
-rw-r--r--ext/mssql/mssql.dsp8
-rw-r--r--ext/mssql/mssql_win32_howto.txt2
-rw-r--r--ext/mssql/php_mssql.c2
-rw-r--r--ext/mysql/mysql.dsp8
-rwxr-xr-xext/mysqli/mysqli.dsp4
-rw-r--r--ext/ncurses/tests/001.phpt2
-rw-r--r--ext/oci8/oci8.dsp8
-rw-r--r--ext/odbc/config.m44
-rw-r--r--ext/openssl/README3
-rw-r--r--ext/openssl/openssl.dsp4
-rw-r--r--ext/oracle/oracle.dsp8
-rw-r--r--ext/pdf/pdf.dsp8
-rw-r--r--ext/pgsql/pgsql.dsp6
-rw-r--r--ext/pspell/README4
-rw-r--r--ext/pspell/pspell.dsp6
-rw-r--r--ext/shmop/README2
-rw-r--r--ext/shmop/shmop.dsp4
-rw-r--r--ext/simplexml/simplexml.dsp4
-rw-r--r--ext/skeleton/skeleton.dsp8
-rw-r--r--ext/skeleton/tests/001.phpt2
-rw-r--r--ext/snmp/snmp.dsp8
-rw-r--r--ext/sockets/sockets.dsp4
-rw-r--r--ext/sqlite/sqlite.dsp4
-rw-r--r--ext/standard/credits_ext.h11
-rw-r--r--ext/standard/credits_sapi.h6
-rw-r--r--ext/sybase/php_sybase_db.c2
-rw-r--r--ext/sybase_ct/php_sybase_ct.c2
-rw-r--r--ext/sybase_ct/sybase_ct.dsp8
-rwxr-xr-xext/tidy/tidy.dsp4
-rw-r--r--ext/tokenizer/tokenizer.dsp4
-rw-r--r--ext/w32api/w32api.c4
-rw-r--r--ext/w32api/w32api.dsp4
-rw-r--r--ext/xml/xml.mak2
-rw-r--r--ext/xmlrpc/xmlrpc.dsp4
-rw-r--r--ext/xsl/xsl.dsp4
-rw-r--r--ext/yaz/yaz.dsp4
-rw-r--r--ext/zlib/zlib.dsp8
-rw-r--r--ext/zlib/zlib_win32_howto.txt2
-rwxr-xr-xnetware/buildsapi.bat4
-rw-r--r--netware/php5apache.mak (renamed from netware/php4apache.mak)6
-rw-r--r--netware/php5apache2filter.mak (renamed from netware/php4apache2filter.mak)4
-rw-r--r--netware/php5cli.mak (renamed from netware/php4cli.mak)2
-rw-r--r--netware/phplib.mak4
-rw-r--r--php5.spec.in (renamed from php4.spec.in)6
-rw-r--r--sapi/activescript/README2
-rw-r--r--sapi/activescript/classfactory.cpp4
-rw-r--r--sapi/activescript/config.w324
-rw-r--r--sapi/activescript/php5activescript.c (renamed from sapi/activescript/php4activescript.c)2
-rw-r--r--sapi/activescript/php5activescript.def (renamed from sapi/activescript/php4activescript.def)0
-rw-r--r--sapi/activescript/php5activescript.dsp (renamed from sapi/activescript/php4activescript.dsp)78
-rw-r--r--sapi/activescript/php5activescript.h (renamed from sapi/activescript/php4activescript.h)0
-rw-r--r--sapi/activescript/php5as_classfactory.h (renamed from sapi/activescript/php4as_classfactory.h)0
-rw-r--r--sapi/activescript/php5as_scriptengine.h (renamed from sapi/activescript/php4as_scriptengine.h)0
-rw-r--r--sapi/activescript/scriptengine.cpp6
-rw-r--r--sapi/aolserver/README2
-rw-r--r--sapi/aolserver/php5aolserver.dsp (renamed from sapi/aolserver/php4aolserver.dsp)42
-rw-r--r--sapi/apache/config.w322
-rw-r--r--sapi/apache/php5apache.dsp (renamed from sapi/apache/php4apache.dsp)44
-rw-r--r--sapi/apache2handler/php5apache2.dsp (renamed from sapi/apache2handler/php4apache2.dsp)32
-rw-r--r--sapi/apache_hooks/apMakefile.tmpl24
-rw-r--r--sapi/apache_hooks/config.m442
-rw-r--r--sapi/apache_hooks/config.w324
-rw-r--r--sapi/apache_hooks/libphp5.module.in (renamed from sapi/apache_hooks/libphp4.module.in)2
-rw-r--r--sapi/apache_hooks/mod_php4.exp1
-rw-r--r--sapi/apache_hooks/mod_php5.c (renamed from sapi/apache_hooks/mod_php4.c)36
-rw-r--r--sapi/apache_hooks/mod_php5.exp1
-rw-r--r--sapi/apache_hooks/mod_php5.h (renamed from sapi/apache_hooks/mod_php4.h)6
-rw-r--r--sapi/apache_hooks/php.sym2
-rwxr-xr-xsapi/apache_hooks/php5apache_hooks.dsp (renamed from sapi/apache_hooks/php4apache_hooks.dsp)48
-rw-r--r--sapi/apache_hooks/php_apache_http.h2
-rw-r--r--sapi/caudium/caudium.c10
-rw-r--r--sapi/caudium/config.m44
-rw-r--r--sapi/cgi/README.FastCGI2
-rw-r--r--sapi/continuity/capi.c2
-rw-r--r--sapi/embed/php5embed.dsp (renamed from sapi/embed/php4embed.dsp)24
-rw-r--r--sapi/isapi/config.m42
-rw-r--r--sapi/isapi/config.w324
-rw-r--r--sapi/isapi/php5isapi.c (renamed from sapi/isapi/php4isapi.c)0
-rw-r--r--sapi/isapi/php5isapi.def (renamed from sapi/isapi/php4isapi.def)0
-rw-r--r--sapi/isapi/php5isapi.dsp (renamed from sapi/isapi/php4isapi.dsp)72
-rw-r--r--sapi/isapi/stresstest/notes.txt2
-rw-r--r--sapi/isapi/stresstest/stresstest.cpp2
-rw-r--r--sapi/nsapi/php5nsapi.dsp (renamed from sapi/nsapi/php4nsapi.dsp)56
-rw-r--r--sapi/pi3web/README26
-rw-r--r--sapi/pi3web/config.m42
-rw-r--r--sapi/pi3web/config.w322
-rw-r--r--sapi/pi3web/php5pi3web.dsp (renamed from sapi/pi3web/php4pi3web.dsp)50
-rw-r--r--sapi/pi3web/pi3web_sapi.c6
-rw-r--r--sapi/pi3web/pi3web_sapi.h8
-rw-r--r--sapi/roxen/README4
-rw-r--r--sapi/roxen/TODO12
-rw-r--r--sapi/roxen/config.m42
-rw-r--r--sapi/roxen/roxen.c8
-rw-r--r--sapi/thttpd/config.m44
-rw-r--r--sapi/thttpd/thttpd_patch2
-rw-r--r--sapi/tux/README16
-rw-r--r--sapi/tux/config.m42
-rw-r--r--sapi/webjames/README2
-rwxr-xr-xscripts/dev/credits6
-rwxr-xr-xtests/classes/inheritance_002.phpt8
-rw-r--r--tests/test.php415
-rw-r--r--win32/build/config.w322
-rw-r--r--win32/install.txt84
-rw-r--r--win32/installer/README2
-rw-r--r--win32/installer/gen-nsis.php10
-rw-r--r--win32/php5.dsp (renamed from win32/php4.dsp)38
-rw-r--r--win32/php5.dsw (renamed from win32/php4.dsw)214
-rw-r--r--win32/php5dll.dsp (renamed from win32/php4dll.dsp)248
-rw-r--r--win32/php5dllts.dsp (renamed from win32/php4dllts.dsp)296
-rw-r--r--win32/php5dllts.rc (renamed from win32/php4dllts.rc)4
-rw-r--r--win32/php5dllts.rc2 (renamed from win32/php4dllts.rc2)4
-rw-r--r--win32/php5ts.dsp (renamed from win32/php4ts.dsp)56
-rw-r--r--win32/php5ts.dsw40
-rw-r--r--win32/php5ts.rc (renamed from win32/php4ts.rc)4
-rw-r--r--win32/php5ts.rc2 (renamed from win32/php4ts.rc2)2
-rw-r--r--win32/php5ts_cli.dsp (renamed from win32/php4ts_cli.dsp)56
-rw-r--r--win32/php5ts_cli.rc (renamed from win32/php4ts_cli.rc)4
-rw-r--r--win32/php5ts_cli.rc2 (renamed from win32/php4ts_cli.rc2)2
-rw-r--r--win32/pws-php5cgi.reg (renamed from win32/pws-php4cgi.reg)0
-rw-r--r--win32/pws-php5isapi.reg (renamed from win32/pws-php4isapi.reg)2
-rw-r--r--win32/resource.h2
-rw-r--r--win32/signal.h2
167 files changed, 1134 insertions, 1147 deletions
diff --git a/ChangeLog b/ChangeLog
index 818e671..353d524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1085,9 +1085,9 @@
win32/crypt_win32.h
win32/grp.h
win32/md5crypt.h
- win32/php4dllts.rc2
- win32/php4ts.rc2
- win32/php4ts_cli.rc2
+ win32/php5dllts.rc2
+ win32/php5ts.rc2
+ win32/php5ts_cli.rc2
win32/pwd.h
win32/select.h
win32/syslog.h
@@ -1502,7 +1502,7 @@
2004-01-08 Frank M. Kromann <frank@kromann.info>
- * win32/php4dllts.dsp:
+ * win32/php5dllts.dsp:
Adding new com_dotnet source files to project
2004-01-07 Jani Taskinen <jani.taskinen@kolumbus.fi>
diff --git a/README.PHP4-TO-PHP5-THIN-CHANGES b/README.PHP4-TO-PHP5-THIN-CHANGES
index 0349af4..d080cd4 100644
--- a/README.PHP4-TO-PHP5-THIN-CHANGES
+++ b/README.PHP4-TO-PHP5-THIN-CHANGES
@@ -34,7 +34,7 @@
- mysqli_fetch_assoc()
5. PATH_TRANSLATED server variable is no longer set implicitly under
- Apache2 SAPI in contrast to the situation in PHP4, where it is set to the
+ Apache2 SAPI in contrast to the situation in PHP 4, where it is set to the
same value as the SCRIPT_FILENAME server variable when it is not populated
by Apache. This change was made to comply with the CGI specification.
Please refer to bug #23610 for further information.
diff --git a/README.Zeus b/README.Zeus
index 8dcbb78..0f2ff21 100644
--- a/README.Zeus
+++ b/README.Zeus
@@ -1,4 +1,4 @@
-Using PHP4 with the Zeus Web Server
+Using PHP5 with the Zeus Web Server
-----------------------------------
Zeus fully supports running PHP in combination with our
diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt
index 3adb686..794dbd7 100755
--- a/Zend/tests/bug26802.phpt
+++ b/Zend/tests/bug26802.phpt
@@ -33,8 +33,8 @@ $static_method = "foo::bar";
$static_method();
-/* The following is a BC break with PHP4 where it would
- * call foo::fail. In PHP5 we first evaluate static class
+/* The following is a BC break with PHP 4 where it would
+ * call foo::fail. In PHP 5 we first evaluate static class
* properties and then do the function call.
*/
$method = 'fail';
diff --git a/configure.in b/configure.in
index 62ae85c..a1550ed 100644
--- a/configure.in
+++ b/configure.in
@@ -1226,7 +1226,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
$php_shtool mkdir -p pear/scripts
$php_shtool mkdir -p scripts
-ALL_OUTPUT_FILES="php4.spec main/build-defs.h \
+ALL_OUTPUT_FILES="php5.spec main/build-defs.h \
scripts/phpize scripts/php-config \
$PHP_OUTPUT_FILES"
diff --git a/ext/bz2/bz2.dsp b/ext/bz2/bz2.dsp
index 00ef626..ebe183c 100644
--- a/ext/bz2/bz2.dsp
+++ b/ext/bz2/bz2.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_bz2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "bz2 - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib libbz2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_bz2.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
diff --git a/ext/com_dotnet/README b/ext/com_dotnet/README
index 2a3bbbd..fb94f8a 100644
--- a/ext/com_dotnet/README
+++ b/ext/com_dotnet/README
@@ -1,6 +1,6 @@
This is the new php5 COM module.
-It is not 100% backwards compatible with php4 ext/com, but you should not miss
+It is not 100% backwards compatible with PHP 4 ext/com, but you should not miss
the "features" that have not been retained.
This module exposes 3 classes: variant, com and dotnet(*).
@@ -26,7 +26,7 @@ $obj = new COM("...");
$obj[1]->foo();
The code above will use the type information for the object to determine its
-default property and then access it. In php4, it was hard-coded to use the
+default property and then access it. In PHP 4, it was hard-coded to use the
"Items" member, which was wrong.
The default property will also be used by the casting support to determine the
@@ -34,7 +34,7 @@ value for the object.
Variants:
-This implementation of COM takes a simpler approach than the php4 version;
+This implementation of COM takes a simpler approach than the PHP 4 version;
we only map a few native types to COM and vice-versa, leaving the more complex
things as variants. This allows greater consistency of data when passing
parameters to and from COM objects (no data will be lost). In addition, a
@@ -72,7 +72,7 @@ TODO:
actually arrays.
- SafeArray support for variant class.
Currently there is no way to access a safearray from php.
-- A few other com_xxx functions need to be ported from the php4 extension.
+- A few other com_xxx functions need to be ported from the PHP 4 extension.
- documentation
* dotnet support requires that you have the mscoree.h header from the .net sdk
diff --git a/ext/cpdf/cpdf.dsp b/ext/cpdf/cpdf.dsp
index 671482e..6b95294 100644
--- a/ext/cpdf/cpdf.dsp
+++ b/ext/cpdf/cpdf.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib cpdf.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_cpdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib cpdf.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_cpdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "cpdf - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 cpdf.lib php4ts_debug.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_cpdf.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib cpdfi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 cpdf.lib php5ts_debug.lib user32.lib winspool.lib kernel32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_cpdf.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/ext/ctype/ctype.dsp b/ext/ctype/ctype.dsp
index 8cb2837..1305c72 100644
--- a/ext/ctype/ctype.dsp
+++ b/ext/ctype/ctype.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ctype.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ctype.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ctype - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ctype.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ctype.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/curl/curl.dsp b/ext/curl/curl.dsp
index 8e824d7..81d8231 100644
--- a/ext/curl/curl.dsp
+++ b/ext/curl/curl.dsp
@@ -55,8 +55,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "curl - Win32 Debug_TS"
@@ -83,8 +83,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "curl - Win32 Debug_TS_SSL"
@@ -111,9 +111,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php5ts_debug.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"MSVCRTD" /out:"..\..\Debug_TS/php_curl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
!ELSEIF "$(CFG)" == "curl - Win32 Release_TS_SSL"
@@ -140,9 +140,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib libcurl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
+# ADD LINK32 php5ts.lib libcurl.lib ssleay32.lib libeay32.lib msvcrt.lib ws2_32.lib winmm.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /nodefaultlib:"MSVCRT" /out:"..\..\Release_TS/php_curl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/ext/dba/dba.dsp b/ext/dba/dba.dsp
index 97cfa66..ddfd148 100644
--- a/ext/dba/dba.dsp
+++ b/ext/dba/dba.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dba.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "dba - Win32 Debug_TS Berkeley DB3"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libdb31s.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_dba.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/dbase/dbase.dsp b/ext/dbase/dbase.dsp
index 63bb66d..7c75304 100644
--- a/ext/dbase/dbase.dsp
+++ b/ext/dbase/dbase.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbase.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbase.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "dbase - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_dbase.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_dbase.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/ext/dbx/dbx.dsp b/ext/dbx/dbx.dsp
index 8d86a65..9cc264a 100644
--- a/ext/dbx/dbx.dsp
+++ b/ext/dbx/dbx.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_dbx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "dbx - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"../../Debug_TS/php_dbx.dll" /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"../../Debug_TS/php_dbx.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"../../Debug_TS/php_dbx.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"../../Debug_TS/php_dbx.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/dio/tests/001.phpt b/ext/dio/tests/001.phpt
index d527e1a..99aa5bd 100644
--- a/ext/dio/tests/001.phpt
+++ b/ext/dio/tests/001.phpt
@@ -15,7 +15,7 @@ echo "dio extension is available";
to pass, differences between the output and the
expected text are interpreted as failure
- see php4/tests/README for further information on
+ see php5/tests/README for further information on
writing regression tests
*/
?>
diff --git a/ext/dom/dom.dsp b/ext/dom/dom.dsp
index 4031a9c..f2ae5b1 100644
--- a/ext/dom/dom.dsp
+++ b/ext/dom/dom.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 wsock32.lib php4ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /machine:I386 /out:"..\..\Release_TS/php_dom.dll" /implib:"..\..\Release_TS/php_dom.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 wsock32.lib php5ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /machine:I386 /out:"..\..\Release_TS/php_dom.dll" /implib:"..\..\Release_TS/php_dom.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "dom - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib ws2_32.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS\php_dom.dll" /implib:"..\..\Debug_TS/php_dom.lib" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib ws2_32.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS\php_dom.dll" /implib:"..\..\Debug_TS/php_dom.lib" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"
!ENDIF
diff --git a/ext/exif/exif.dsp b/ext/exif/exif.dsp
index b6c16e7..4a82733 100644
--- a/ext/exif/exif.dsp
+++ b/ext/exif/exif.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_exif.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_exif.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "exif - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_exif.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_exif.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/fbsql/fbsql.dsp b/ext/fbsql/fbsql.dsp
index 91829c7..a711863 100644
--- a/ext/fbsql/fbsql.dsp
+++ b/ext/fbsql/fbsql.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_fbsql.dll" /libpath:"..\..\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts.lib /nologo /dll /machine:I386 /out:"Release/php_fbsql.dll" /libpath:"..\..\Release"
!ELSEIF "$(CFG)" == "fbsql - Win32 Debug"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_fbsql.dll" /pdbtype:sept /libpath:"..\..\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_fbsql.dll" /pdbtype:sept /libpath:"..\..\Debug"
!ELSEIF "$(CFG)" == "fbsql - Win32 Debug_TS"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib php4ts_debug.lib FBCAccess.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\Debug_TS/php_fbsql.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"\usr\FrontBase\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib php5ts_debug.lib FBCAccess.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\Debug_TS/php_fbsql.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"\usr\FrontBase\lib"
!ELSEIF "$(CFG)" == "fbsql - Win32 Release_TS"
@@ -133,7 +133,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib FBCAccess.lib ws2_32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\Release_TS/php_fbsql.dll" /libpath:"..\..\Release_TS" /libpath:"\usr\FrontBase\lib" /libpath:"..\..\Release_TS_inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib FBCAccess.lib ws2_32.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBC" /out:"..\..\Release_TS/php_fbsql.dll" /libpath:"..\..\Release_TS" /libpath:"\usr\FrontBase\lib" /libpath:"..\..\Release_TS_inline"
!ENDIF
diff --git a/ext/fdf/fdf.dsp b/ext/fdf/fdf.dsp
index 9cce9df..85b91ce 100644
--- a/ext/fdf/fdf.dsp
+++ b/ext/fdf/fdf.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib fdftk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_fdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib fdftk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_fdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "fdf - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib fdftk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_fdf.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib fdftk.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_fdf.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/filepro/filepro.dsp b/ext/filepro/filepro.dsp
index 441b14e..af9d7f2 100644
--- a/ext/filepro/filepro.dsp
+++ b/ext/filepro/filepro.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_filepro.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_filepro.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "filepro - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_filepro.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_filepro.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/gd/gd.dsp b/ext/gd/gd.dsp
index c61a4d4..d787286 100644
--- a/ext/gd/gd.dsp
+++ b/ext/gd/gd.dsp
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\zlib\Release"
+# ADD LINK32 php5ts.lib freetype2.lib libjpeg.lib libpng.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gd2.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\zlib\Release"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "gd - Win32 Debug_TS GD2"
@@ -84,9 +84,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.lib libjpeg.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 php4ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\zlib\Debug"
+# ADD LINK32 php5ts_debug.lib libpng.lib zlib.lib libjpeg.lib freetype2.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_gd2.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\zlib\Debug"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/ext/gettext/gettext.dsp b/ext/gettext/gettext.dsp
index 9601782..79ea194 100644
--- a/ext/gettext/gettext.dsp
+++ b/ext/gettext/gettext.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib libintl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib libintl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "gettext - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib libintl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libintl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/gmp/tests/001.phpt b/ext/gmp/tests/001.phpt
index a2f520d..d4a3576 100644
--- a/ext/gmp/tests/001.phpt
+++ b/ext/gmp/tests/001.phpt
@@ -15,7 +15,7 @@ echo "gmp extension is available";
to pass, differences between the output and the
expected text are interpreted as failure
- see php4/tests/README for further information on
+ see php5/tests/README for further information on
writing regression tests
*/
?>
diff --git a/ext/iconv/iconv.dsp b/ext/iconv/iconv.dsp
index 2db814e..2d66cf0 100644
--- a/ext/iconv/iconv.dsp
+++ b/ext/iconv/iconv.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_iconv.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_iconv.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "iconv - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_iconv.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_iconv.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/imap/imap.dsp b/ext/imap/imap.dsp
index 08cc00e..ef05d49 100644
--- a/ext/imap/imap.dsp
+++ b/ext/imap/imap.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /out:"Release/php_imap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /machine:I386 /out:"Release/php_imap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\IMAP\C-Client"
!ELSEIF "$(CFG)" == "imap - Win32 Debug"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_imap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_imap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\IMAP\C-Client"
!ELSEIF "$(CFG)" == "imap - Win32 Debug_TS"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll" /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib wsock32.lib winmm.lib cclient.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_imap.dll" /pdbtype:sept /libpath:"..\..\..\\" /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "imap - Win32 Release_TS"
@@ -133,7 +133,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\imap"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib wsock32.lib winmm.lib cclient.lib Secur32.lib CertIdl.Lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\..\Release_TS/php_imap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\imap"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
diff --git a/ext/informix/ifx.dsp b/ext/informix/ifx.dsp
index a7ad0f3..a87a422 100644
--- a/ext/informix/ifx.dsp
+++ b/ext/informix/ifx.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 isqlt09a.lib php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\Release_TS/php_ifx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 isqlt09a.lib php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\Release_TS/php_ifx.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ifx - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 isqlt09a.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug_TS/php_ifx.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 isqlt09a.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug_TS/php_ifx.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index 916a178..ba5114d 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -13,7 +13,7 @@
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Danny Heijl <Danny.Heijl@cevi.be> : initial cut (ODS 7.2x) |
- | PHP4 port |
+ | PHP 4 port |
| Christian Cartus <chc@idgruppe.de> : blobs, and IUS 9 |
| Jouni Ahto <jouni.ahto@exdec.fi> : configuration stuff |
| Corne' Cornelius <cornec@reach.co.za> : input descriptors |
diff --git a/ext/ingres_ii/README b/ext/ingres_ii/README
index d16d152..422bec9 100644
--- a/ext/ingres_ii/README
+++ b/ext/ingres_ii/README
@@ -1,5 +1,5 @@
-Ingres II extension for PHP 4.0
-===============================
+Ingres II extension for PHP
+===========================
This extension provides access to Ingres II servers from PHP 4.0.
It is still in development and has been only quickly tested on
diff --git a/ext/ingres_ii/ingres.dsp b/ext/ingres_ii/ingres.dsp
index c3815ac..d7b515e 100644
--- a/ext/ingres_ii/ingres.dsp
+++ b/ext/ingres_ii/ingres.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib oiapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ingres.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib oiapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ingres.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ingres - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib oiapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ingres.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib oiapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ingres.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/interbase/interbase.dsp b/ext/interbase/interbase.dsp
index b38872c..b3cc811 100644
--- a/ext/interbase/interbase.dsp
+++ b/ext/interbase/interbase.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_interbase.dll" /pdbtype:sept /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib php5ts_debug.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_interbase.dll" /pdbtype:sept /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "interbase - Win32 Release_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_interbase.dll" /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ib_util_ms.lib gds32_ms.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_interbase.dll" /libpath:"..\..\..\php_build\Interbase SDK\lib_ms" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ENDIF
diff --git a/ext/ldap/LDAP_Win32_HOWTO.txt b/ext/ldap/LDAP_Win32_HOWTO.txt
index ae085de..bcee731 100644
--- a/ext/ldap/LDAP_Win32_HOWTO.txt
+++ b/ext/ldap/LDAP_Win32_HOWTO.txt
@@ -14,7 +14,7 @@ Note 1: During the entire build process, you can ignore warnings about
For 'Win32 Debug', change the runtime library to 'Debug Multithreaded DLL'
For 'Win32 Release', change the runtime library to 'Multithreaded DLL'
Select the Preprocessor tab, select 'All Configurations'.
- Add '..\..\..\..\php4\regex' to the 'Additional include directories' list.
+ Add '..\..\..\..\php5\regex' to the 'Additional include directories' list.
Add 'HAVE_MKTEMP' to the 'Preprocessor definitions' list.
- Compile (you can compile both Debug and Release versions).
diff --git a/ext/ldap/ldap.dsp b/ext/ldap/ldap.dsp
index 1bb5366..a97ebe4 100644
--- a/ext/ldap/ldap.dsp
+++ b/ext/ldap/ldap.dsp
@@ -59,7 +59,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_ldap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\openldap\libraries\Release"
+# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5nts.lib /nologo /dll /machine:I386 /out:"Release/php_ldap.dll" /libpath:"..\..\Release" /libpath:"..\..\..\php_build\openldap\libraries\Release"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug"
@@ -85,7 +85,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 oldap32.lib olber32.lib php4nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD LINK32 oldap32.lib olber32.lib php5nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug_TS"
@@ -111,8 +111,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib php4nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\openldap\libraries\Debug" /libpath:"..\..\Debug"
-# ADD LINK32 oldap32.lib olber32.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD BASE LINK32 oldap32.lib olber32.lib php5nts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\openldap\libraries\Debug" /libpath:"..\..\Debug"
+# ADD LINK32 oldap32.lib olber32.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
!ELSEIF "$(CFG)" == "ldap - Win32 Release_TS"
@@ -137,8 +137,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ldap - Win32 Release_TS SASL"
@@ -164,8 +164,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 oldap32.lib olber32.lib libsasl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 oldap32.lib olber32.lib libsasl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug_TS SASL"
@@ -191,8 +191,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
-# ADD LINK32 oldap32.lib olber32.lib libsasl.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD BASE LINK32 oldap32.lib olber32.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD LINK32 oldap32.lib olber32.lib libsasl.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
!ELSEIF "$(CFG)" == "ldap - Win32 Release_TS_SSL"
@@ -218,8 +218,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib oldap32.lib olber32.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 oldap32.lib olber32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib oldap32.lib olber32.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ldap.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\openldap\libraries\Release" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ldap - Win32 Debug_TS_SSL"
@@ -245,8 +245,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 oldap32.lib olber32.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
-# ADD LINK32 php4ts_debug.lib oldap32.lib olber32.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD BASE LINK32 oldap32.lib olber32.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
+# ADD LINK32 php5ts_debug.lib oldap32.lib olber32.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ldap.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\openldap\libraries\Debug"
!ENDIF
diff --git a/ext/ldap/ldap.mak b/ext/ldap/ldap.mak
index 6f0d1db..959fe16 100644
--- a/ext/ldap/ldap.mak
+++ b/ext/ldap/ldap.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ..\..
# Module details
MODULE_NAME = php_ldap
-MODULE_DESC = "PHP 4.3 - LDAP Extension"
+MODULE_DESC = "PHP 5 - LDAP Extension"
VMAJ = 3
VMIN = 0
VREV = 0
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index f7c0026..2a1944d 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -20,7 +20,7 @@
/* $Id$ */
/*
- * PHP4 Multibyte String module "mbstring"
+ * PHP 4 Multibyte String module "mbstring"
*
* History:
* 2000.5.19 Release php-4.0RC2_jstring-1.0
diff --git a/ext/mbstring/mbstring.dsp b/ext/mbstring/mbstring.dsp
index d3625d4..38776f5 100644
--- a/ext/mbstring/mbstring.dsp
+++ b/ext/mbstring/mbstring.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mbstring.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mbstring.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mbstring.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mbstring.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "mbstring - Win32 Debug_TS MBSTRING"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mbstring.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mbstring.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mbstring.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mbstring.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
index 8774023..696ee65 100644
--- a/ext/mbstring/mbstring.h
+++ b/ext/mbstring/mbstring.h
@@ -19,7 +19,7 @@
/* $Id$ */
/*
- * PHP4 Multibyte String module "mbstring" (currently only for Japanese)
+ * PHP 4 Multibyte String module "mbstring" (currently only for Japanese)
*
* History:
* 2000.5.19 Release php-4.0RC2_jstring-1.0
diff --git a/ext/mcrypt/mcrypt.dsp b/ext/mcrypt/mcrypt.dsp
index 2df6ed5..a0a1f00 100644
--- a/ext/mcrypt/mcrypt.dsp
+++ b/ext/mcrypt/mcrypt.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS"
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmcrypt.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mcrypt.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mcrypt" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\TSRM\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmcrypt.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mcrypt.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mcrypt" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\TSRM\Release_TS_Inline"
!ELSEIF "$(CFG)" == "mcrypt - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS" /libpath:"mssql-70"
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmcrypt.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mcrypt.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mcrypt\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS" /libpath:"mssql-70"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmcrypt.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mcrypt.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mcrypt\lib"
!ENDIF
diff --git a/ext/mcve/config.m4 b/ext/mcve/config.m4
index 8f9a9e3..e20aa6e 100644
--- a/ext/mcve/config.m4
+++ b/ext/mcve/config.m4
@@ -1,4 +1,4 @@
-dnl config.m4 for PHP4 MCVE Extension
+dnl config.m4 for PHP MCVE Extension
PHP_ARG_WITH(mcve, for MCVE support,
[ --with-mcve[=DIR] Include MCVE support. libmcve >= 3.2.2 required])
diff --git a/ext/mcve/mcve.dsp b/ext/mcve/mcve.dsp
index 33842ec..f170d83 100644
--- a/ext/mcve/mcve.dsp
+++ b/ext/mcve/mcve.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libmcve.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mcve.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib libmcve.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mcve.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "mcve - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libmcve.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mcve.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libmcve.lib ssleay32.lib libeay32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mcve.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/mcve/tests/001.phpt b/ext/mcve/tests/001.phpt
index ba4b5f1..c96aeab 100644
--- a/ext/mcve/tests/001.phpt
+++ b/ext/mcve/tests/001.phpt
@@ -15,7 +15,7 @@ echo "mcve extension is available";
to pass, differences between the output and the
expected text are interpreted as failure
- see php4/tests/README for further information on
+ see php5/tests/README for further information on
writing regression tests
*/
?>
diff --git a/ext/mhash/mhash.dsp b/ext/mhash/mhash.dsp
index 1252593..0fa0226 100644
--- a/ext/mhash/mhash.dsp
+++ b/ext/mhash/mhash.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libmhash.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mhash.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib libmhash.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mhash.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "mhash - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib libmhash.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mhash.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib libmhash.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mhash.dll" /libpath:"..\..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/ext/mime_magic/mime_magic.dsp b/ext/mime_magic/mime_magic.dsp
index 714cfe1..7c6ce31 100644
--- a/ext/mime_magic/mime_magic.dsp
+++ b/ext/mime_magic/mime_magic.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mime_magic.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mime_magic.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "mime_magic - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mime_magic.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mime_magic.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
diff --git a/ext/ming/ming.dsp b/ext/ming/ming.dsp
index 0c4e562..00dfbd4 100644
--- a/ext/ming/ming.dsp
+++ b/ext/ming/ming.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ming.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ming.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "ming - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libming.lib zlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/mnogosearch/README b/ext/mnogosearch/README
index 43f3958..2b43157 100644
--- a/ext/mnogosearch/README
+++ b/ext/mnogosearch/README
@@ -1,7 +1,7 @@
$Source$
$Id$
-mnoGoSearch extension module for PHP4.
+mnoGoSearch extension module for PHP.
For details please refer to http://www.mnogosearch.org/
diff --git a/ext/mnogosearch/index.php b/ext/mnogosearch/index.php
index 62f1d62..40cde62 100644
--- a/ext/mnogosearch/index.php
+++ b/ext/mnogosearch/index.php
@@ -12,7 +12,7 @@
*/
if (!extension_loaded('mnogosearch')) {
- print "<b>This script requires PHP4.0.5+ with mnoGoSearch extension</b>";
+ print "<b>This script requires PHP 4.0.5+ with mnoGoSearch extension</b>";
exit;
}
diff --git a/ext/msql/msql.dsp b/ext/msql/msql.dsp
index 7b77d36..a8f5724 100644
--- a/ext/msql/msql.dsp
+++ b/ext/msql/msql.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib php4ts.lib msql_dll.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_msql.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib php5ts.lib msql_dll.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_msql.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "msql - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib php4ts_debug.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_msql.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 kernel32.lib php5ts_debug.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_msql.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/mssql/mssql.dsp b/ext/mssql/mssql.dsp
index ea79d3b..283923b 100644
--- a/ext/mssql/mssql.dsp
+++ b/ext/mssql/mssql.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mssql70.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mssql-70\lib" /libpath:"..\..\Release_TS_Inline"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mssql.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mssql-70\lib" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mssql70.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mssql-70\lib" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mssql.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\mssql-70\lib" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "mssql - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mssql70.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mssql-70\lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mssql.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mssql-70\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mssql70.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mssql-70\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_mssql.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\mssql-70\lib"
!ENDIF
diff --git a/ext/mssql/mssql_win32_howto.txt b/ext/mssql/mssql_win32_howto.txt
index 901099f..d42bc25 100644
--- a/ext/mssql/mssql_win32_howto.txt
+++ b/ext/mssql/mssql_win32_howto.txt
@@ -12,7 +12,7 @@ Win32 Debug_TS
php_build\mssql-70\include\sqlfront.h
php_build\mssql-70\lib\ntwdblib.lib
-php_build is a directory at the same level as php4.
+php_build is a directory at the same level as php5.
Start Visual Studio, load php_modules.dsw, select the MSSQL projects,
configuration and build it.
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index d72b876..8154e6b 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -330,7 +330,7 @@ PHP_RINIT_FUNCTION(mssql)
{
MS_SQL_G(default_link) = -1;
MS_SQL_G(num_links) = MS_SQL_G(num_persistent);
- MS_SQL_G(appname) = estrndup("PHP 4.0",7);
+ MS_SQL_G(appname) = estrndup("PHP 5", 5);
MS_SQL_G(server_message) = empty_string;
MS_SQL_G(min_error_severity) = MS_SQL_G(cfg_min_error_severity);
MS_SQL_G(min_message_severity) = MS_SQL_G(cfg_min_message_severity);
diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp
index 81f9ecd..dfc9c63 100644
--- a/ext/mysql/mysql.dsp
+++ b/ext/mysql/mysql.dsp
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5nts.lib /nologo /dll /machine:I386 /out:"Release/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
!ELSEIF "$(CFG)" == "mysql - Win32 Debug"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5nts_debug.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"
!ELSEIF "$(CFG)" == "mysql - Win32 Debug_TS"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "mysql - Win32 Release_TS"
@@ -133,7 +133,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ENDIF
diff --git a/ext/mysqli/mysqli.dsp b/ext/mysqli/mysqli.dsp
index fc4ec4c..a334202 100755
--- a/ext/mysqli/mysqli.dsp
+++ b/ext/mysqli/mysqli.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib zlib.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mysqli.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts.lib zlib.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_mysqli.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "mysqli - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib zlib.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mysqli.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib zlib.lib libmySQL.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_mysqli.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
diff --git a/ext/ncurses/tests/001.phpt b/ext/ncurses/tests/001.phpt
index 90d9c14..b6701f4 100644
--- a/ext/ncurses/tests/001.phpt
+++ b/ext/ncurses/tests/001.phpt
@@ -15,7 +15,7 @@ echo "ncurses extension is available";
to pass, differences between the output and the
expected text are interpreted as failure
- see php4/tests/README for further information on
+ see php5/tests/README for further information on
writing regression tests
*/
?>
diff --git a/ext/oci8/oci8.dsp b/ext/oci8/oci8.dsp
index ecb892c..73c0534 100644
--- a/ext/oci8/oci8.dsp
+++ b/ext/oci8/oci8.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib oci.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_oci8.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\oci805\lib" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib oci.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_oci8.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\oci805\lib" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "oci8 - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib oci.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_oci8.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\lib\oci805"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib oci.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_oci8.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\lib\oci805"
!ENDIF
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 8c7eb01..ce518dc 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -214,7 +214,7 @@ AC_MSG_CHECKING(for Empress support)
AC_ARG_WITH(empress,
[ --with-empress[=DIR] Include Empress support. DIR is the Empress base
install directory, defaults to \$EMPRESSPATH.
- From PHP4, this option only supports Empress Version
+ From PHP 4, this option only supports Empress Version
8.60 and above],
[
PHP_WITH_SHARED
@@ -246,7 +246,7 @@ AC_ARG_WITH(empress-bcs,
[ --with-empress-bcs[=DIR]
Include Empress Local Access support. DIR is the
Empress base install directory, defaults to
- \$EMPRESSPATH. From PHP4, this option only supports
+ \$EMPRESSPATH. From PHP 4, this option only supports
Empress Version 8.60 and above.],
[
PHP_WITH_SHARED
diff --git a/ext/openssl/README b/ext/openssl/README
index df3f79d..20a3833 100644
--- a/ext/openssl/README
+++ b/ext/openssl/README
@@ -1,4 +1,5 @@
-OpenSSL extension for PHP4
+OpenSSL extension for PHP
+
$Id$
The functions implemented so far make it possible to seal and open data, and
diff --git a/ext/openssl/openssl.dsp b/ext/openssl/openssl.dsp
index c68b2db..857666a 100644
--- a/ext/openssl/openssl.dsp
+++ b/ext/openssl/openssl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_openssl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_openssl.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "openssl - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_openssl.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib ssleay32.lib libeay32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_openssl.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/oracle/oracle.dsp b/ext/oracle/oracle.dsp
index 1791bf8..fbaa218 100644
--- a/ext/oracle/oracle.dsp
+++ b/ext/oracle/oracle.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ociw32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_oracle.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\oci73\lib" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib ociw32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_oracle.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\oci73\lib" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "oracle - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts-debug.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib ociw32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_oracle.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\oci73\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts-debug.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib ociw32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_oracle.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\oci73\lib"
!ENDIF
diff --git a/ext/pdf/pdf.dsp b/ext/pdf/pdf.dsp
index 654fe55..9d4a76c 100644
--- a/ext/pdf/pdf.dsp
+++ b/ext/pdf/pdf.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib pdflib.lib zlib.lib libpng.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_pdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib pdflib.lib zlib.lib libpng.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_pdf.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pdf - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib pdflib.lib zlib.lib libpng.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pdf.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib pdflib.lib zlib.lib libpng.lib libtiff.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pdf.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp
index 79c9321..098469f 100644
--- a/ext/pgsql/pgsql.dsp
+++ b/ext/pgsql/pgsql.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpqdll.lib php4ts.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Release/pgsql.dll" /libpath:"..\..\..\PostgreSQL\lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpqdll.lib php5ts.lib /nologo /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"../../Release/pgsql.dll" /libpath:"..\..\..\PostgreSQL\lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "pgsql - Win32 Debug"
@@ -110,8 +110,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpqdll.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\..\PostgreSQL\lib" /libpath:"..\..\Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpq.lib php4ts.lib /nologo /dll /machine:I386 /out:"../../Release_TS/php_pgsql.dll" /libpath:"..\..\..\php_build\postgresql\src\interfaces\libpq\Release" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpqdll.lib php5ts.lib /nologo /dll /machine:I386 /libpath:"..\..\..\PostgreSQL\lib" /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib libpq.lib php5ts.lib /nologo /dll /machine:I386 /out:"../../Release_TS/php_pgsql.dll" /libpath:"..\..\..\php_build\postgresql\src\interfaces\libpq\Release" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "pgsql - Win32 Debug_TS"
diff --git a/ext/pspell/README b/ext/pspell/README
index b7d3adf..4969a81 100644
--- a/ext/pspell/README
+++ b/ext/pspell/README
@@ -1,5 +1,5 @@
-README file for pspell (spellchecker) module for PHP4
------------------------------------------------------
+README file for pspell (spellchecker) module for PHP
+----------------------------------------------------
The latest release of pspell is always available from
diff --git a/ext/pspell/pspell.dsp b/ext/pspell/pspell.dsp
index e752e9f..f310099 100644
--- a/ext/pspell/pspell.dsp
+++ b/ext/pspell/pspell.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
-# ADD LINK32 php4ts_debug.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\aspell\lib"
+# ADD BASE LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_pspell.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\aspell\lib"
!ELSEIF "$(CFG)" == "pspell - Win32 Release_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_pspell.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\aspell\lib"
+# ADD LINK32 php5ts.lib aspell-15.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_pspell.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\aspell\lib"
!ENDIF
diff --git a/ext/shmop/README b/ext/shmop/README
index d1cc5ab..5ec1586 100644
--- a/ext/shmop/README
+++ b/ext/shmop/README
@@ -1,6 +1,6 @@
last update Jan 2, 2002 (hackie@prohost.org/ilia@prohost.org)
-Shared Memory Operations Extension to PHP4
+Shared Memory Operations Extension to PHP
While developing a search deamon we needed a php based front end
to communicate the deamon via SHM. PHP already had a shared memory
diff --git a/ext/shmop/shmop.dsp b/ext/shmop/shmop.dsp
index 634cd77..848f0bd 100644
--- a/ext/shmop/shmop.dsp
+++ b/ext/shmop/shmop.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_shmop.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_shmop.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "shmop - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_shmop.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_shmop.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/simplexml/simplexml.dsp b/ext/simplexml/simplexml.dsp
index d614ee6..79df918 100644
--- a/ext/simplexml/simplexml.dsp
+++ b/ext/simplexml/simplexml.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php5\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php5\Debug_TS"
!ELSEIF "$(CFG)" == "simplexml - Win32 Release_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\..\php5\Release_TS" /libpath:"..\..\..\php5\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\..\php5\Release_TS" /libpath:"..\..\..\php5\Release_TS_Inline"
!ENDIF
diff --git a/ext/skeleton/skeleton.dsp b/ext/skeleton/skeleton.dsp
index f918abd..c3c67c7 100644
--- a/ext/skeleton/skeleton.dsp
+++ b/ext/skeleton/skeleton.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_extname.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_extname.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "extname - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_extname.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_extname.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/skeleton/tests/001.phpt b/ext/skeleton/tests/001.phpt
index 7ef8472..854dc7f 100644
--- a/ext/skeleton/tests/001.phpt
+++ b/ext/skeleton/tests/001.phpt
@@ -16,7 +16,7 @@ echo "extname extension is available";
to pass, differences between the output and the
expected text are interpreted as failure
- see php4/README.TESTING for further information on
+ see php5/README.TESTING for further information on
writing regression tests
*/
?>
diff --git a/ext/snmp/snmp.dsp b/ext/snmp/snmp.dsp
index ed016a4..3cc6233 100644
--- a/ext/snmp/snmp.dsp
+++ b/ext/snmp/snmp.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib libsnmp.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_snmp.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib libsnmp.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_snmp.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "snmp - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib libsnmp.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_snmp.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib libsnmp.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_snmp.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/sockets/sockets.dsp b/ext/sockets/sockets.dsp
index c4c8a65..961bab7 100644
--- a/ext/sockets/sockets.dsp
+++ b/ext/sockets/sockets.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_sockets.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_sockets.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /debug
!ELSEIF "$(CFG)" == "sockets - Win32 Debug_TS"
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_sockets.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_sockets.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/sqlite/sqlite.dsp b/ext/sqlite/sqlite.dsp
index 1a07d51..f6dfb43 100644
--- a/ext/sqlite/sqlite.dsp
+++ b/ext/sqlite/sqlite.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_sqlite.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_sqlite.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "sqlite - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h
index 3864a63..c436873 100644
--- a/ext/standard/credits_ext.h
+++ b/ext/standard/credits_ext.h
@@ -1,9 +1,9 @@
/*
DO NOT EDIT THIS FILE!
- it has been automaticaly created by php4/scripts/credits from
- the information found in the various php4/ext/.../CREDITS and
- php4/sapi/.../CREDITS files
+ it has been automaticaly created by php5/scripts/credits from
+ the information found in the various php5/ext/.../CREDITS and
+ php5/sapi/.../CREDITS files
if you want to change an entry you have to edit the appropriate
CREDITS file instead
@@ -54,7 +54,7 @@ CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
CREDIT_LINE("ncurses", "Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter");
-CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky");
+CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal");
CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky");
CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");
CREDIT_LINE("Oracle", "Stig Bakken, Mitch Golden, Rasmus Lerdorf, Andreas Karajannis, Thies C. Arntzen");
@@ -69,7 +69,7 @@ CREDIT_LINE("Readline", "Thies C. Arntzen");
CREDIT_LINE("Recode", "Kristian Köhntopp");
CREDIT_LINE("Sessions", "Sascha Schumann, Andrei Zmievski");
CREDIT_LINE("Shared Memory Operations", "Slava Poliakov, Ilia Alshanetsky");
-CREDIT_LINE("simplexml", "Sterling Hughes");
+CREDIT_LINE("simplexml", "Sterling Hughes, Marcus Boerger");
CREDIT_LINE("SNMP", "Rasmus Lerdorf, Harrie Hazewinkel, Mike Jackson, Steven Lawrance, Johann Hanne");
CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason Greene");
CREDIT_LINE("sqlite", "Wez Furlong, Tal Peer, Marcus Börger, Ilia Alshanetsky");
@@ -78,6 +78,7 @@ CREDIT_LINE("Sybase-DB", "Zeev Suraski");
CREDIT_LINE("System V Message based IPC", "Wez Furlong");
CREDIT_LINE("System V Semaphores", "Tom May");
CREDIT_LINE("System V Shared Memory", "Christian Cartus");
+CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");
CREDIT_LINE("tokenizer", "Andrei Zmievski");
CREDIT_LINE("Verisign Payflow Pro", "John Donagher, David Croft");
CREDIT_LINE("W32API", "James Moore");
diff --git a/ext/standard/credits_sapi.h b/ext/standard/credits_sapi.h
index 14bfe57..ab7c275 100644
--- a/ext/standard/credits_sapi.h
+++ b/ext/standard/credits_sapi.h
@@ -1,9 +1,9 @@
/*
DO NOT EDIT THIS FILE!
- it has been automaticaly created by php4/scripts/credits from
- the information found in the various php4/ext/.../CREDITS and
- php4/sapi/.../CREDITS files
+ it has been automaticaly created by php5/scripts/credits from
+ the information found in the various php5/ext/.../CREDITS and
+ php5/sapi/.../CREDITS files
if you want to change an entry you have to edit the appropriate
CREDITS file instead
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 9b68874..40e8089 100644
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -281,7 +281,7 @@ PHP_RINIT_FUNCTION(sybase)
{
php_sybase_module.default_link=-1;
php_sybase_module.num_links = php_sybase_module.num_persistent;
- php_sybase_module.appname = estrndup("PHP 4.0",7);
+ php_sybase_module.appname = estrndup("PHP 5", 5);
php_sybase_module.server_message = empty_string;
php_sybase_module.min_error_severity = php_sybase_module.cfg_min_error_severity;
php_sybase_module.min_message_severity = php_sybase_module.cfg_min_message_severity;
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index d750442..f50b831 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -386,7 +386,7 @@ PHP_RINIT_FUNCTION(sybase)
{
SybCtG(default_link)=-1;
SybCtG(num_links) = SybCtG(num_persistent);
- SybCtG(appname) = estrndup("PHP 4.0", 7);
+ SybCtG(appname) = estrndup("PHP 5", 5);
SybCtG(server_message) = empty_string;
return SUCCESS;
}
diff --git a/ext/sybase_ct/sybase_ct.dsp b/ext/sybase_ct/sybase_ct.dsp
index f1a1abf..be2f890 100644
--- a/ext/sybase_ct/sybase_ct.dsp
+++ b/ext/sybase_ct/sybase_ct.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libct.lib libcs.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_sybase_ct.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libct.lib libcs.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_sybase_ct.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "sybase_ct - Win32 Debug_TS"
@@ -81,8 +81,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_sybase_ct.dll" /libpath:"..\..\Debug_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_sybase_ct.dll" /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/tidy/tidy.dsp b/ext/tidy/tidy.dsp
index 75e33ec..fe44fa7 100755
--- a/ext/tidy/tidy.dsp
+++ b/ext/tidy/tidy.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libtidy.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_tidy.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts.lib libtidy.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_tidy.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\release"
!ELSEIF "$(CFG)" == "tidy - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libtidy.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_tidy.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
+# ADD LINK32 php5ts_debug.lib libtidy.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_tidy.dll" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\release"
!ENDIF
diff --git a/ext/tokenizer/tokenizer.dsp b/ext/tokenizer/tokenizer.dsp
index a131efe..9844574 100644
--- a/ext/tokenizer/tokenizer.dsp
+++ b/ext/tokenizer/tokenizer.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_tokenizer.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_tokenizer.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "tokenizer - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_tokenizer.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_tokenizer.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/w32api/w32api.c b/ext/w32api/w32api.c
index 3d2365c..6f7fe37 100644
--- a/ext/w32api/w32api.c
+++ b/ext/w32api/w32api.c
@@ -19,8 +19,8 @@
/* $Id$ */
/*
- * Win32 API Extension for PHP 4
- * =============================
+ * Win32 API Extension for PHP
+ * ===========================
*
* This extension allows PHP Developers to access the underlying functions in the
* Win32 API Dll's in a generic way, it provides a mechanism for the user to load
diff --git a/ext/w32api/w32api.dsp b/ext/w32api/w32api.dsp
index 71eaaf5..aa77f36 100644
--- a/ext/w32api/w32api.dsp
+++ b/ext/w32api/w32api.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../Debug_TS/php_w32api.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"../../Debug_TS/php_w32api.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "w32api - Win32 Release_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /debugtype:both /machine:I386 /out:"../../Release_TS/php_w32api.dll" /libpath:"..\..\Release_TS"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /debugtype:both /machine:I386 /out:"../../Release_TS/php_w32api.dll" /libpath:"..\..\Release_TS"
# SUBTRACT LINK32 /incremental:yes
!ENDIF
diff --git a/ext/xml/xml.mak b/ext/xml/xml.mak
index 971008d..ab60f28 100644
--- a/ext/xml/xml.mak
+++ b/ext/xml/xml.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ..\..
# Module details
MODULE_NAME = php_xml
-MODULE_DESC = "PHP 4.3 - XML Extension"
+MODULE_DESC = "PHP 5 - XML Extension"
VMAJ = 3
VMIN = 0
VREV = 0
diff --git a/ext/xmlrpc/xmlrpc.dsp b/ext/xmlrpc/xmlrpc.dsp
index e5fb24e..8c455d3 100644
--- a/ext/xmlrpc/xmlrpc.dsp
+++ b/ext/xmlrpc/xmlrpc.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_xmlrpc.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_xmlrpc.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ELSEIF "$(CFG)" == "xmlrpc - Win32 Release_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_xmlrpc.dll" /libpath:"..\..\Release_TS"
+# ADD LINK32 php5ts.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_xmlrpc.dll" /libpath:"..\..\Release_TS"
!ENDIF
diff --git a/ext/xsl/xsl.dsp b/ext/xsl/xsl.dsp
index 87ec231..ff7257d 100644
--- a/ext/xsl/xsl.dsp
+++ b/ext/xsl/xsl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 wsock32.lib php4ts.lib libxslt_a.lib libexslt_a.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_xsl.dll" /implib:".Release_TS/php_xsl.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release"
+# ADD LINK32 wsock32.lib php5ts.lib libxslt_a.lib libexslt_a.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_xsl.dll" /implib:".Release_TS/php_xsl.lib" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\bindlib_w32\Release"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "xsl - Win32 Debug_TS"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libxslt_a.lib libexslt_a.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xsl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release" /libpath:"..\..\..\php_build\lib\libxslt"
+# ADD LINK32 php5ts_debug.lib libxslt_a.lib libexslt_a.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xsl.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release" /libpath:"..\..\..\php_build\lib\libxslt"
!ENDIF
diff --git a/ext/yaz/yaz.dsp b/ext/yaz/yaz.dsp
index 1d45516..e662cb6 100644
--- a/ext/yaz/yaz.dsp
+++ b/ext/yaz/yaz.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib yaz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_yaz.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php5ts.lib yaz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_yaz.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "yaz - Win32 Debug_TS"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib yaz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_yaz.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib yaz.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS/php_yaz.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
!ENDIF
diff --git a/ext/zlib/zlib.dsp b/ext/zlib/zlib.dsp
index 999953f..97543e4 100644
--- a/ext/zlib/zlib.dsp
+++ b/ext/zlib/zlib.dsp
@@ -53,8 +53,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib zlib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_zlib.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\zlib\Release" /libpath:"..\..\Release_TS_Inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib zlib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_zlib.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\zlib\Release" /libpath:"..\..\Release_TS_Inline"
!ELSEIF "$(CFG)" == "zlib - Win32 Debug_TS"
@@ -80,8 +80,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib zlib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_zlib.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\zlib\Debug"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib zlib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_zlib.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\zlib\Debug"
!ENDIF
diff --git a/ext/zlib/zlib_win32_howto.txt b/ext/zlib/zlib_win32_howto.txt
index 72e767a..a4e01a4 100644
--- a/ext/zlib/zlib_win32_howto.txt
+++ b/ext/zlib/zlib_win32_howto.txt
@@ -7,7 +7,7 @@ php_build\zlib\include\zlib.h
php_build\zlib\include\zconf.h
php_build\zlib\lib\zlibstat.lib
-php_build is a directory at the same level as php4.
+php_build is a directory at the same level as php5.
Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build
it.
diff --git a/netware/buildsapi.bat b/netware/buildsapi.bat
index 57498cb..ddf299a 100755
--- a/netware/buildsapi.bat
+++ b/netware/buildsapi.bat
@@ -2,11 +2,11 @@
cd ..\sapi\%1
-if "%2" == "clean" make -f ..\..\netware\php4%1.mak clean
+if "%2" == "clean" make -f ..\..\netware\php5%1.mak clean
if "%2" == "/?" goto USAGE
REM Build command
-make -f ..\..\netware\php4%1.mak
+make -f ..\..\netware\php5%1.mak
goto EXIT
:USAGE
diff --git a/netware/php4apache.mak b/netware/php5apache.mak
index 5573941..d7d9342 100644
--- a/netware/php4apache.mak
+++ b/netware/php5apache.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ../..
# Module details
MODULE_NAME = mod_php
-MODULE_DESC = "PHP 4.3 - Apache 1.3 Module"
+MODULE_DESC = "PHP 5 - Apache 1.3 Module"
VMAJ = 3
VMIN = 0
VREV = 0
@@ -17,7 +17,7 @@ include $(PROJECT_ROOT)/netware/common.mif
.SUFFIXES: .nlm .lib .obj .cpp .c .msg .mlc .mdb .xdc .d
# Source files
-C_SRC = mod_php4.c \
+C_SRC = mod_php5.c \
php_apache.c \
sapi_apache.c \
libpre.c
@@ -80,7 +80,7 @@ MODULE = LibC \
IMPORT = @$(SDK_DIR)/imports/libc.imp \
@$(PROJECT_ROOT)/netware/apachecore.imp \
@$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php4_module
+EXPORT = php5_module
# Virtual paths
diff --git a/netware/php4apache2filter.mak b/netware/php5apache2filter.mak
index 99e8e24..7cc1a29 100644
--- a/netware/php4apache2filter.mak
+++ b/netware/php5apache2filter.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ../..
# Module details
MODULE_NAME = mod_php
-MODULE_DESC = "PHP 4.3 - Apache 2.0 Module"
+MODULE_DESC = "PHP 5 - Apache 2.0 Module"
VMAJ = 3
VMIN = 0
VREV = 0
@@ -81,7 +81,7 @@ IMPORT = @$(SDK_DIR)/imports/libc.imp \
@$(APACHE_DIR)/lib/httpd.imp \
@$(APACHE_DIR)/lib/aprlib.imp \
@$(PROJECT_ROOT)/netware/phplib.imp
-EXPORT = php4_module
+EXPORT = php5_module
# Virtual paths
diff --git a/netware/php4cli.mak b/netware/php5cli.mak
index 941ed58..30a1896 100644
--- a/netware/php4cli.mak
+++ b/netware/php5cli.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ../..
# Module details
MODULE_NAME = php
-MODULE_DESC = "PHP 4.2.3 - Command Line Interface"
+MODULE_DESC = "PHP 5 - Command Line Interface"
VMAJ = 2
VMIN = 0
VREV = 0
diff --git a/netware/phplib.mak b/netware/phplib.mak
index 95026f2..90b6e67 100644
--- a/netware/phplib.mak
+++ b/netware/phplib.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = .
# Module details
MODULE_NAME = phplib
-MODULE_DESC = "PHP 4.3 - Script Interpreter and Library"
+MODULE_DESC = "PHP 5 - Script Interpreter and Library"
VMAJ = 3
VMIN = 0
VREV = 0
@@ -200,7 +200,7 @@ C_FLAGS += -relax_pointers # To remove type-casting errors
C_FLAGS += -processor Pentium
C_FLAGS += -nostdinc -nosyspath
C_FLAGS += -DNETWARE -D__BIT_TYPES_DEFINED__ -DZTS
-C_FLAGS += -DPHP4DLLTS_EXPORTS -DPHP_EXPORTS -DLIBZEND_EXPORTS -DTSRM_EXPORTS -DSAPI_EXPORTS
+C_FLAGS += -DPHP5DLLTS_EXPORTS -DPHP_EXPORTS -DLIBZEND_EXPORTS -DTSRM_EXPORTS -DSAPI_EXPORTS
C_FLAGS += -DHAVE_SYS_TIME_H -DHAVE_STRUCT_FLOCK -DVIRTUAL_DIR -DHAVE_TZNAME
C_FLAGS += -DHAVE_DLFCN_H -DHAVE_LIBDL
C_FLAGS += -DCLIB_STAT_PATCH # stat patch
diff --git a/php4.spec.in b/php5.spec.in
index 044eb8d..97a84b5 100644
--- a/php4.spec.in
+++ b/php5.spec.in
@@ -1,6 +1,6 @@
%define version @VERSION@
-%define so_version 4
-%define release 1
+%define so_version 5
+%define release 0
Name: php
Summary: PHP: Hypertext Preprocessor
@@ -8,7 +8,7 @@ Group: Development/Languages
Version: %{version}
Release: %{release}
Copyright: The PHP license (see "LICENSE" file included in distribution)
-Source: http://www.php.net/version4/downloads/php-%{version}.tar.gz
+Source: http://www.php.net/get/php-%{version}.tar.gz/from/a/mirror
Icon: php.gif
URL: http://www.php.net/
Packager: PHP Group <group@php.net>
diff --git a/sapi/activescript/README b/sapi/activescript/README
index b033110..70f4982 100644
--- a/sapi/activescript/README
+++ b/sapi/activescript/README
@@ -19,7 +19,7 @@ Installation.
Build and install it somewhere; then register the engine like this:
- regsvr32 php4activescript.dll
+ regsvr32 php5activescript.dll
Usage.
======
diff --git a/sapi/activescript/classfactory.cpp b/sapi/activescript/classfactory.cpp
index 4bcdafe..ecdd6f6 100644
--- a/sapi/activescript/classfactory.cpp
+++ b/sapi/activescript/classfactory.cpp
@@ -32,8 +32,8 @@ HINSTANCE module_handle;
#include <comcat.h>
#include "TSRM.h"
-#include "php4as_classfactory.h"
-#include "php4as_scriptengine.h"
+#include "php5as_classfactory.h"
+#include "php5as_scriptengine.h"
volatile LONG TPHPClassFactory::factory_count = 0;
volatile LONG TPHPClassFactory::object_count = 0;
diff --git a/sapi/activescript/config.w32 b/sapi/activescript/config.w32
index 9c2a3aa..1448cb2 100644
--- a/sapi/activescript/config.w32
+++ b/sapi/activescript/config.w32
@@ -8,6 +8,6 @@ if (PHP_ACTIVESCRIPT == "yes") {
ERROR("ActiveScript module requires an --enable-zts build of PHP");
}
- SAPI('activescript', 'classfactory.cpp php4activescript.c scriptengine.cpp', 'php' + PHP_VERSION + 'activescript.dll', '/D PHP4ISAPI_EXPORTS');
- ADD_FLAG('LDFLAGS_ACTIVESCRIPT', 'oleaut32.lib ole32.lib user32.lib advapi32.lib /DEF:' + configure_module_dirname + '\\php4activescript.def');
+ SAPI('activescript', 'classfactory.cpp php5activescript.c scriptengine.cpp', 'php' + PHP_VERSION + 'activescript.dll', '/D PHP5ISAPI_EXPORTS');
+ ADD_FLAG('LDFLAGS_ACTIVESCRIPT', 'oleaut32.lib ole32.lib user32.lib advapi32.lib /DEF:' + configure_module_dirname + '\\php5activescript.def');
}
diff --git a/sapi/activescript/php4activescript.c b/sapi/activescript/php5activescript.c
index 8ce96f1..6aa4b41 100644
--- a/sapi/activescript/php4activescript.c
+++ b/sapi/activescript/php5activescript.c
@@ -24,7 +24,7 @@
#include "ext/standard/info.h"
#include "php_variables.h"
#include "php_ini.h"
-#include "php4activescript.h"
+#include "php5activescript.h"
/* SAPI definitions and DllMain */
diff --git a/sapi/activescript/php4activescript.def b/sapi/activescript/php5activescript.def
index f111b68..f111b68 100644
--- a/sapi/activescript/php4activescript.def
+++ b/sapi/activescript/php5activescript.def
diff --git a/sapi/activescript/php4activescript.dsp b/sapi/activescript/php5activescript.dsp
index cbfafa1..5143828 100644
--- a/sapi/activescript/php4activescript.dsp
+++ b/sapi/activescript/php5activescript.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4activescript" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5activescript" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4activescript - Win32 Debug_TS
+CFG=php5activescript - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4activescript.mak".
+!MESSAGE NMAKE /f "php5activescript.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4activescript.mak" CFG="php4activescript - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5activescript.mak" CFG="php5activescript - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4activescript - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4activescript - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4activescript - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4activescript - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5activescript - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5activescript - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5activescript - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5activescript - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4activescript - Win32 Debug_TS"
+!IF "$(CFG)" == "php5activescript - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -44,8 +44,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GX /ZI /Od /Ob0 /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D "COMPILE_LIBZEND" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /Ze /W3 /Gm /GX /ZI /Od /Ob0 /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D "COMPILE_LIBZEND" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"
-!ELSEIF "$(CFG)" == "php4activescript - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5activescript - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -70,8 +70,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -81,14 +81,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
-!ELSEIF "$(CFG)" == "php4activescript - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5activescript - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4activescript___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4activescript___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5activescript___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5activescript___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -97,8 +97,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS_inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4activescript - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5activescript - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4activescript___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4activescript___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5activescript___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5activescript___Win32_Release_TSDbg"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -124,8 +124,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TSDbg"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -134,17 +134,17 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /debug /machine:I386 /libpath:"..\..\Release_TSDbg"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /debug /machine:I386 /libpath:"..\..\Release_TSDbg"
!ENDIF
# Begin Target
-# Name "php4activescript - Win32 Debug_TS"
-# Name "php4activescript - Win32 Release_TS"
-# Name "php4activescript - Win32 Release_TS_inline"
-# Name "php4activescript - Win32 Release_TSDbg"
+# Name "php5activescript - Win32 Debug_TS"
+# Name "php5activescript - Win32 Release_TS"
+# Name "php5activescript - Win32 Release_TS_inline"
+# Name "php5activescript - Win32 Release_TSDbg"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -154,11 +154,11 @@ SOURCE=.\classfactory.cpp
# End Source File
# Begin Source File
-SOURCE=.\php4activescript.c
+SOURCE=.\php5activescript.c
# End Source File
# Begin Source File
-SOURCE=.\php4activescript.def
+SOURCE=.\php5activescript.def
# End Source File
# Begin Source File
@@ -170,15 +170,15 @@ SOURCE=.\scriptengine.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\php4activescript.h
+SOURCE=.\php5activescript.h
# End Source File
# Begin Source File
-SOURCE=.\php4as_classfactory.h
+SOURCE=.\php5as_classfactory.h
# End Source File
# Begin Source File
-SOURCE=.\php4as_scriptengine.h
+SOURCE=.\php5as_scriptengine.h
# End Source File
# End Group
# End Target
diff --git a/sapi/activescript/php4activescript.h b/sapi/activescript/php5activescript.h
index ba8be9b..ba8be9b 100644
--- a/sapi/activescript/php4activescript.h
+++ b/sapi/activescript/php5activescript.h
diff --git a/sapi/activescript/php4as_classfactory.h b/sapi/activescript/php5as_classfactory.h
index 2f1695f..2f1695f 100644
--- a/sapi/activescript/php4as_classfactory.h
+++ b/sapi/activescript/php5as_classfactory.h
diff --git a/sapi/activescript/php4as_scriptengine.h b/sapi/activescript/php5as_scriptengine.h
index fd5fd52..fd5fd52 100644
--- a/sapi/activescript/php4as_scriptengine.h
+++ b/sapi/activescript/php5as_scriptengine.h
diff --git a/sapi/activescript/scriptengine.cpp b/sapi/activescript/scriptengine.cpp
index bf6de93..7853af1 100644
--- a/sapi/activescript/scriptengine.cpp
+++ b/sapi/activescript/scriptengine.cpp
@@ -42,13 +42,13 @@ extern "C" {
#include "php_globals.h"
#include "php_variables.h"
#include "php_ini.h"
-#include "php4activescript.h"
+#include "php5activescript.h"
#include "ext/com_dotnet/php_com_dotnet.h"
#include "ext/com_dotnet/php_com_dotnet_internal.h"
}
#include "php_ticks.h"
-#include "php4as_scriptengine.h"
-#include "php4as_classfactory.h"
+#include "php5as_scriptengine.h"
+#include "php5as_classfactory.h"
#include <objbase.h>
/* {{{ trace */
diff --git a/sapi/aolserver/README b/sapi/aolserver/README
index 0a725a1..80c186e 100644
--- a/sapi/aolserver/README
+++ b/sapi/aolserver/README
@@ -60,7 +60,7 @@ Then enable the PHP module:
ns_section "ns/server/${servername}/modules"
...
-ns_param php ${bindir}/libphp4.so
+ns_param php ${bindir}/libphp5.so
=============================================================================
diff --git a/sapi/aolserver/php4aolserver.dsp b/sapi/aolserver/php5aolserver.dsp
index 1d5a795..dd6ad71 100644
--- a/sapi/aolserver/php4aolserver.dsp
+++ b/sapi/aolserver/php5aolserver.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4aolserver" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5aolserver" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4aolserver - Win32 Debug_TS
+CFG=php5aolserver - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4aolserver.mak".
+!MESSAGE NMAKE /f "php5aolserver.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4aolserver.mak" CFG="php4aolserver - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5aolserver.mak" CFG="php5aolserver - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4aolserver - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4aolserver - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4aolserver - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5aolserver - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5aolserver - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5aolserver - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4aolserver - Win32 Release_TS"
+!IF "$(CFG)" == "php5aolserver - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4AOLSERVER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "NDEBUG" /D "PHP4AOLSERVER_EXPORTS" /D "PHP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "HAVE_AOLSERVER" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5AOLSERVER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "NDEBUG" /D "PHP5AOLSERVER_EXPORTS" /D "PHP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "HAVE_AOLSERVER" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 nsd.lib php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /out:"../../Release_TS/php4aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
+# ADD LINK32 nsd.lib php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /out:"../../Release_TS/php5aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
-!ELSEIF "$(CFG)" == "php4aolserver - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5aolserver - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4AOLSERVER_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5AOLSERVER_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "PHPAOLSERVER_EXPORTS" /D "PHP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "HAVE_AOLSERVER" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -80,9 +80,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 nsd.lib php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /out:"../../Release_TS_inline/php4aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
+# ADD LINK32 nsd.lib php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /out:"../../Release_TS_inline/php5aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4aolserver - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5aolserver - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -95,8 +95,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4AOLSERVER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D "_DEBUG" /D ZEND_DEBUG=1 /D "PHP4AOLSERVER_EXPORTS" /D "PHP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "HAVE_AOLSERVER" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5AOLSERVER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D "_DEBUG" /D ZEND_DEBUG=1 /D "PHP5AOLSERVER_EXPORTS" /D "PHP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WIN32" /D "_MBCS" /D "HAVE_AOLSERVER" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -106,15 +106,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 nsd.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php4aolserver.so" /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
+# ADD LINK32 nsd.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /debug /machine:I386 /out:"..\..\Debug_TS/php5aolserver.so" /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
!ENDIF
# Begin Target
-# Name "php4aolserver - Win32 Release_TS"
-# Name "php4aolserver - Win32 Release_TS_inline"
-# Name "php4aolserver - Win32 Debug_TS"
+# Name "php5aolserver - Win32 Release_TS"
+# Name "php5aolserver - Win32 Release_TS_inline"
+# Name "php5aolserver - Win32 Debug_TS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32
index 1dde452..83ceb1a 100644
--- a/sapi/apache/config.w32
+++ b/sapi/apache/config.w32
@@ -17,7 +17,7 @@ if (PHP_APACHE != "no") {
// headers
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
'php' + PHP_VERSION + 'apache.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+ '/D APACHEPHP5_EXPORTS /D APACHE_READDIR_H /I win32');
} else {
WARNING("Could not find apache libraries/headers");
}
diff --git a/sapi/apache/php4apache.dsp b/sapi/apache/php5apache.dsp
index b6e2085..fbdb761 100644
--- a/sapi/apache/php4apache.dsp
+++ b/sapi/apache/php5apache.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4apache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5apache" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4apache - Win32 Release_TS
+CFG=php5apache - Win32 Release_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4apache.mak".
+!MESSAGE NMAKE /f "php5apache.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4apache.mak" CFG="php4apache - Win32 Release_TS"
+!MESSAGE NMAKE /f "php5apache.mak" CFG="php5apache - Win32 Release_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4apache - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4apache - Win32 Release_TS"
+!IF "$(CFG)" == "php5apache - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\release" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
+# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\release" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
-!ELSEIF "$(CFG)" == "php4apache - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5apache - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -80,9 +80,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php_build\release" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
+# ADD LINK32 php5ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php_build\release" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
-!ELSEIF "$(CFG)" == "php4apache - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5apache - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -95,8 +95,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\includes" /I "..\..\main" /I "..\..\TSRM" /I "..\..\regex" /I "C:\Program Files\Apache Group\Apache\include" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -106,15 +106,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\release" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
+# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\release" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline" /libpath:"C:\Program Files\Apache Group\Apache\libexec"
!ENDIF
# Begin Target
-# Name "php4apache - Win32 Release_TS"
-# Name "php4apache - Win32 Debug_TS"
-# Name "php4apache - Win32 Release_TS_inline"
+# Name "php5apache - Win32 Release_TS"
+# Name "php5apache - Win32 Debug_TS"
+# Name "php5apache - Win32 Release_TS_inline"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/sapi/apache2handler/php4apache2.dsp b/sapi/apache2handler/php5apache2.dsp
index c20655a..40cd58c 100644
--- a/sapi/apache2handler/php4apache2.dsp
+++ b/sapi/apache2handler/php5apache2.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4apache2" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5apache2" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4apache2 - Win32 Debug_TS
+CFG=php5apache2 - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4apache2.mak".
+!MESSAGE NMAKE /f "php5apache2.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4apache2.mak" CFG="php4apache2 - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5apache2.mak" CFG="php5apache2 - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4apache2 - Win32 Release_TS"
+!IF "$(CFG)" == "php5apache2 - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
+# ADD LINK32 php5ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
-!ELSEIF "$(CFG)" == "php4apache2 - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5apache2 - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -80,9 +80,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php4apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
+# ADD LINK32 php5ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php5apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4apache2 - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5apache2 - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -105,15 +105,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
+# ADD LINK32 php5ts_debug.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
!ENDIF
# Begin Target
-# Name "php4apache2 - Win32 Release_TS"
-# Name "php4apache2 - Win32 Release_TS_inline"
-# Name "php4apache2 - Win32 Debug_TS"
+# Name "php5apache2 - Win32 Release_TS"
+# Name "php5apache2 - Win32 Release_TS_inline"
+# Name "php5apache2 - Win32 Debug_TS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/sapi/apache_hooks/apMakefile.tmpl b/sapi/apache_hooks/apMakefile.tmpl
index 80fe346..4054e8e 100644
--- a/sapi/apache_hooks/apMakefile.tmpl
+++ b/sapi/apache_hooks/apMakefile.tmpl
@@ -1,38 +1,38 @@
##
## Apache 1.3 Makefile template for PHP 4.0 Module
-## [src/modules/php4/Makefile.tmpl]
+## [src/modules/php5/Makefile.tmpl]
##
# the parametrized target
-LIB=libphp4.$(LIBEXT)
+LIB=libphp5.$(LIBEXT)
# objects for building the static library
-OBJS=mod_php4.o
-OBJS_LIB=libmodphp4.a
+OBJS=mod_php5.o
+OBJS_LIB=libmodphp5.a
# objects for building the shared object library
-SHLIB_OBJS=mod_php4.so-o
-SHLIB_OBJS_LIB=libmodphp4.a
+SHLIB_OBJS=mod_php5.so-o
+SHLIB_OBJS_LIB=libmodphp5.a
# the general targets
all: lib
lib: $(LIB)
# build the static library by merging the object files
-libphp4.a: $(OBJS) $(OBJS_LIB)
+libphp5.a: $(OBJS) $(OBJS_LIB)
cp $(OBJS_LIB) $@
ar r $@ $(OBJS)
$(RANLIB) $@
# ugly hack to support older Apache-1.3 betas that don't set $LIBEXT
-libphp4.: $(OBJS) $(OBJS_LIB)
+libphp5.: $(OBJS) $(OBJS_LIB)
cp $(OBJS_LIB) $@
ar r $@ $(OBJS)
$(RANLIB) $@
- cp libphp4. libphp4.a
+ cp libphp5. libphp5.a
# build the shared object library by linking the object files
-libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
rm -f $@
$(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) $(PHP_LIBS)
@@ -69,9 +69,9 @@ depend:
$(OBJS): Makefile
# DO NOT REMOVE
-mod_php4.o: mod_php4.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+mod_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
$(INCDIR)/buff.h \
$(INCDIR)/http_config.h \
$(INCDIR)/http_core.h $(INCDIR)/http_main.h \
$(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php4.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php5.h
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 558250b..51702c5 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -53,16 +53,16 @@ AC_ARG_WITH(apache-hooks,
*aix*)
APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
- PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
+ PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
;;
*darwin*)
MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
PHP_SUBST(MH_BUNDLE_FLAGS)
- SAPI_SHARED=libs/libphp4.so
- PHP_SELECT_SAPI(apache_hooks, bundle, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
+ SAPI_SHARED=libs/libphp5.so
+ PHP_SELECT_SAPI(apache_hooks, bundle, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
;;
*)
- PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php4.c php_apache.c, -I$APXS_INCLUDEDIR)
+ PHP_SELECT_SAPI(apache_hooks, shared, sapi_apache.c mod_php5.c php_apache.c, -I$APXS_INCLUDEDIR)
;;
esac
@@ -70,9 +70,9 @@ AC_ARG_WITH(apache-hooks,
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
if test "$?" != "0"; then
- APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option
+ APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
else
- APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED"
+ APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php5 $SAPI_SHARED"
fi
if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
@@ -86,7 +86,7 @@ AC_ARG_WITH(apache-hooks,
AC_MSG_RESULT(no)
])
-APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php4.* sapi/apache_hooks/libphp4.module"
+APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module"
if test "$PHP_SAPI" != "apache_hooks"; then
AC_MSG_CHECKING(for Apache 1.x (hooks) module support)
@@ -106,7 +106,7 @@ AC_ARG_WITH(apache-hooks-static,
if test -f $withval/src/httpd.h; then
APACHE_INCLUDE=-I$withval/src
APACHE_TARGET=$withval/src
- PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
+ PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
PHP_LIBS="-L. -lphp3"
AC_MSG_RESULT(yes - Apache 1.2.x)
@@ -122,13 +122,13 @@ AC_ARG_WITH(apache-hooks-static,
elif test -f $withval/src/main/httpd.h; then
APACHE_HAS_REGEX=1
APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
- APACHE_TARGET=$withval/src/modules/php4
+ APACHE_TARGET=$withval/src/modules/php5
if test ! -d $APACHE_TARGET; then
mkdir $APACHE_TARGET
fi
- PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+ PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
if test -f $withval/src/include/ap_config.h; then
@@ -148,13 +148,13 @@ AC_ARG_WITH(apache-hooks-static,
elif test -f $withval/src/include/httpd.h; then
APACHE_HAS_REGEX=1
APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
- APACHE_TARGET=$withval/src/modules/php4
+ APACHE_TARGET=$withval/src/modules/php5
if test ! -d $APACHE_TARGET; then
mkdir $APACHE_TARGET
fi
- PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
if test -f $withval/src/include/ap_config.h; then
@@ -174,9 +174,9 @@ AC_ARG_WITH(apache-hooks-static,
elif test -f $withval/apache/httpd.h; then
APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
APACHE_TARGET=$withval/apache
- PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
- PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
+ PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+ PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
STRONGHOLD=-DSTRONGHOLD=1
AC_MSG_RESULT(yes - StrongHold)
if test -f $withval/apache/ap_config.h; then
@@ -206,7 +206,7 @@ AC_ARG_WITH(apache-hooks-static,
fi
if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
- APXS_EXP=-bE:sapi/apache_hooks/mod_php4.exp
+ APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp
fi
PHP_SUBST(APXS_EXP)
@@ -230,7 +230,7 @@ AC_ARG_WITH(mod_charset,
if test -n "$APACHE_MODULE"; then
PHP_TARGET_RDYNAMIC
$php_shtool mkdir -p sapi/apache_hooks
- PHP_OUTPUT(sapi/apache_hooks/libphp4.module)
+ PHP_OUTPUT(sapi/apache_hooks/libphp5.module)
fi
if test -n "$APACHE_INSTALL"; then
diff --git a/sapi/apache_hooks/config.w32 b/sapi/apache_hooks/config.w32
index 66a5535..9a4d125 100644
--- a/sapi/apache_hooks/config.w32
+++ b/sapi/apache_hooks/config.w32
@@ -12,9 +12,9 @@ if (PHP_APACHE_HOOKS != "no") {
';..\\php_build\\apache\\src\\corer')) {
// We need to play tricks to get our readdir.h used by apache
// headers
- SAPI('apache_hooks', 'mod_php4.c sapi_apache.c php_apache.c',
+ SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
'php' + PHP_VERSION + 'apache_hooks.dll',
- '/D APACHEPHP4_EXPORTS /D APACHE_READDIR_H /I win32');
+ '/D APACHEPHP5_EXPORTS /D APACHE_READDIR_H /I win32');
} else {
WARNING("Could not find apache libraries/headers");
}
diff --git a/sapi/apache_hooks/libphp4.module.in b/sapi/apache_hooks/libphp5.module.in
index ccb9749..8488181 100644
--- a/sapi/apache_hooks/libphp4.module.in
+++ b/sapi/apache_hooks/libphp5.module.in
@@ -1,4 +1,4 @@
-Name: php4_module
+Name: php5_module
ConfigStart
RULE_WANTHSREGEX=no
RULE_HIDE=yes
diff --git a/sapi/apache_hooks/mod_php4.exp b/sapi/apache_hooks/mod_php4.exp
deleted file mode 100644
index 2dca125..0000000
--- a/sapi/apache_hooks/mod_php4.exp
+++ /dev/null
@@ -1 +0,0 @@
-php4_module
diff --git a/sapi/apache_hooks/mod_php4.c b/sapi/apache_hooks/mod_php5.c
index fa06795..8551ad0 100644
--- a/sapi/apache_hooks/mod_php4.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -88,11 +88,11 @@ static CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_per_dir_co
static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode);
static CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_per_dir_config *conf, char *arg1, char *arg2);
-/* ### these should be defined in mod_php4.h or somewhere else */
+/* ### these should be defined in mod_php5.h or somewhere else */
#define USE_PATH 1
#define IGNORE_URL 2
-module MODULE_VAR_EXPORT php4_module;
+module MODULE_VAR_EXPORT php5_module;
int saved_umask;
//static int setup_env = 0;
@@ -657,7 +657,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
return DECLINED;
}
- per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
if (per_dir_conf) {
zend_hash_apply((HashTable *) per_dir_conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
}
@@ -931,7 +931,7 @@ static CONST_PREFIX char *php_set_server_handler(server_rec *s, char *arg1, long
handler->type = handler_type;
handler->stage = handler_stage;
handler->name = strdup(arg1);
- conf = get_module_config(s->module_config, &php4_module);
+ conf = get_module_config(s->module_config, &php5_module);
switch(handler_stage) {
case AP_URI_TRANS:
sapi_stack_push(&conf->uri_handlers, handler);
@@ -1169,7 +1169,7 @@ static int php_xbithack_handler(request_rec * r)
r->allowed |= (1 << METHODS) - 1;
return DECLINED;
}
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
if (conf) {
zend_hash_apply((HashTable *) conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
}
@@ -1248,7 +1248,7 @@ static int php_run_hook(php_handler *handler, request_rec *r)
TSRMLS_FETCH();
if(!AP(apache_config_loaded)) {
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
if (conf)
zend_hash_apply((HashTable *)conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
AP(apache_config_loaded) = 1;
@@ -1280,7 +1280,7 @@ static int php_uri_translation(request_rec *r)
php_per_server_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_URI_TRANS;
- conf = (php_per_server_config *) get_module_config(r->server->module_config, &php4_module);
+ conf = (php_per_server_config *) get_module_config(r->server->module_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_equals(&conf->uri_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook, r, OK);
@@ -1291,7 +1291,7 @@ static int php_header_hook(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_HEADER_PARSE;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->headers_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook, r);
@@ -1302,7 +1302,7 @@ static int php_auth_hook(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_AUTHENTICATION;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_equals(&conf->auth_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook, r, OK);
@@ -1314,7 +1314,7 @@ static int php_access_hook(request_rec *r)
int status = DECLINED;
TSRMLS_FETCH();
AP(current_hook) = AP_ACCESS_CONTROL;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
status = sapi_stack_apply_with_argument_stop_if_http_error(&conf->access_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook, r);
@@ -1327,7 +1327,7 @@ static int php_type_hook(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_TYPE_CHECKING;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_equals(&conf->type_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook,
@@ -1339,7 +1339,7 @@ static int php_fixup_hook(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_FIXUP;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->fixup_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook,
@@ -1351,7 +1351,7 @@ static int php_logger_hook(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_LOGGING;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->logger_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook,
@@ -1364,11 +1364,11 @@ static int php_post_read_hook(request_rec *r)
php_per_server_config *svr;
TSRMLS_FETCH();
AP(current_hook) = AP_POST_READ;
- svr = get_module_config(r->server->module_config, &php4_module);
+ svr = get_module_config(r->server->module_config, &php5_module);
if(ap_is_initial_req(r)) {
sapi_stack_apply_with_argument_all(&svr->requires, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r);
}
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_stop_if_http_error(&conf->post_read_handlers,
ZEND_STACK_APPLY_BOTTOMUP,
(int (*)(void *element, void *)) php_run_hook, r);
@@ -1379,7 +1379,7 @@ static int php_response_handler(request_rec *r)
php_per_dir_config *conf;
TSRMLS_FETCH();
AP(current_hook) = AP_RESPONSE;
- conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php4_module);
+ conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php5_module);
return sapi_stack_apply_with_argument_all(&conf->response_handlers, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r);
}
@@ -1430,9 +1430,9 @@ command_rec php_commands[] =
};
/* }}} */
-/* {{{ module MODULE_VAR_EXPORT php4_module
+/* {{{ module MODULE_VAR_EXPORT php5_module
*/
-module MODULE_VAR_EXPORT php4_module =
+module MODULE_VAR_EXPORT php5_module =
{
STANDARD_MODULE_STUFF,
php_init_handler, /* initializer */
diff --git a/sapi/apache_hooks/mod_php5.exp b/sapi/apache_hooks/mod_php5.exp
new file mode 100644
index 0000000..9ad0f0a
--- /dev/null
+++ b/sapi/apache_hooks/mod_php5.exp
@@ -0,0 +1 @@
+php5_module
diff --git a/sapi/apache_hooks/mod_php4.h b/sapi/apache_hooks/mod_php5.h
index 5ca4dfc..8e62ccd 100644
--- a/sapi/apache_hooks/mod_php4.h
+++ b/sapi/apache_hooks/mod_php5.h
@@ -17,8 +17,8 @@
*/
/* $Id$ */
-#ifndef MOD_PHP4_H
-#define MOD_PHP4_H
+#ifndef MOD_PHP5_H
+#define MOD_PHP5_H
#if !defined(WIN32) && !defined(WINNT)
#ifndef MODULE_VAR_EXPORT
@@ -71,7 +71,7 @@ extern php_apache_info_struct php_apache_info;
#define AP_LOGGING 10
#define AP_CLEANUP 11
-#endif /* MOD_PHP4_H */
+#endif /* MOD_PHP5_H */
/*
* Local variables:
diff --git a/sapi/apache_hooks/php.sym b/sapi/apache_hooks/php.sym
index 2dca125..9ad0f0a 100644
--- a/sapi/apache_hooks/php.sym
+++ b/sapi/apache_hooks/php.sym
@@ -1 +1 @@
-php4_module
+php5_module
diff --git a/sapi/apache_hooks/php4apache_hooks.dsp b/sapi/apache_hooks/php5apache_hooks.dsp
index 3a2f347..cc60f4b 100755
--- a/sapi/apache_hooks/php4apache_hooks.dsp
+++ b/sapi/apache_hooks/php5apache_hooks.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4apache_hooks" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5apache_hooks" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4apache_hooks - Win32 Release_TS
+CFG=php5apache_hooks - Win32 Release_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4apache_hooks.mak".
+!MESSAGE NMAKE /f "php5apache_hooks.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4apache_hooks.mak" CFG="php4apache_hooks - Win32 Release_TS"
+!MESSAGE NMAKE /f "php5apache_hooks.mak" CFG="php5apache_hooks - Win32 Release_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4apache_hooks - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache_hooks - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4apache_hooks - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache_hooks - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache_hooks - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5apache_hooks - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4apache_hooks - Win32 Release_TS"
+!IF "$(CFG)" == "php5apache_hooks - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\apache\src\corer" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
+# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\apache\src\corer" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
-!ELSEIF "$(CFG)" == "php4apache_hooks - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5apache_hooks - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -80,9 +80,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php4apache_hooks.dll" /pdbtype:sept /libpath:"..\..\..\php_build\apache\src\cored" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
+# ADD LINK32 php5ts_debug.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x60000000" /version:4.0 /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php5apache_hooks.dll" /pdbtype:sept /libpath:"..\..\..\php_build\apache\src\cored" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
-!ELSEIF "$(CFG)" == "php4apache_hooks - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5apache_hooks - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -95,8 +95,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP4_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\..\regex" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\..\php_build\apache\src\include" /I "..\..\main" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "APACHEPHP5_EXPORTS" /D "WIN32" /D "_MBCS" /D "APACHE_READDIR_H" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -106,21 +106,21 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"\apache\src\corer" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
+# ADD LINK32 php5ts.lib ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"\apache\src\corer" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
!ENDIF
# Begin Target
-# Name "php4apache_hooks - Win32 Release_TS"
-# Name "php4apache_hooks - Win32 Debug_TS"
-# Name "php4apache_hooks - Win32 Release_TS_inline"
+# Name "php5apache_hooks - Win32 Release_TS"
+# Name "php5apache_hooks - Win32 Debug_TS"
+# Name "php5apache_hooks - Win32 Release_TS_inline"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\mod_php4.c
+SOURCE=.\mod_php5.c
# End Source File
# Begin Source File
@@ -136,7 +136,7 @@ SOURCE=.\sapi_apache.c
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=.\mod_php4.h
+SOURCE=.\mod_php5.h
# End Source File
# Begin Source File
diff --git a/sapi/apache_hooks/php_apache_http.h b/sapi/apache_hooks/php_apache_http.h
index b9b3c63..2a03048 100644
--- a/sapi/apache_hooks/php_apache_http.h
+++ b/sapi/apache_hooks/php_apache_http.h
@@ -36,7 +36,7 @@
#include "php_ini.h"
#include "ext/standard/php_standard.h"
-#include "mod_php4.h"
+#include "mod_php5.h"
zval *php_apache_request_new(request_rec *r);
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 1cf4137..68ba73b 100644
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -38,7 +38,7 @@
*/
#define NO_PIKE_SHORTHAND
-/* Ok, we are now using Pike level threads to handle PHP4 since
+/* Ok, we are now using Pike level threads to handle PHP5 since
* the nice th_farm threads aren't working on Linux with glibc 2.2
* (why this is I don't know).
*/
@@ -79,7 +79,7 @@
#endif
#ifndef PIKE_THREADS
-#error The PHP4 module requires that your Pike has thread support.
+#error The PHP5 module requires that your Pike has thread support.
#endif
#undef HIDE_GLOBAL_VARIABLES
@@ -624,7 +624,7 @@ static void php_caudium_module_main(php_caudium_request *ureq)
SG(request_info).headers_only = 0;
}
- /* Let PHP4 handle the deconding of the AUTH */
+ /* Let PHP5 handle the deconding of the AUTH */
php_handle_auth_data(lookup_string_header("HTTP_AUTHORIZATION", NULL), TSRMLS_C);
/* Swap out this thread and release the interpreter lock to allow
* Pike threads to run. We wait since the above would otherwise require
@@ -713,10 +713,10 @@ void f_php_caudium_request_handler(INT32 args)
if(THIS == NULL)
Pike_error("Out of memory.");
- get_all_args("PHP4.Interpreter->run", args, "%S%m%O%*", &script,
+ get_all_args("PHP5.Interpreter->run", args, "%S%m%O%*", &script,
&request_data, &my_fd_obj, &done_callback);
if(done_callback->type != PIKE_T_FUNCTION)
- Pike_error("PHP4.Interpreter->run: Bad argument 4, expected function.\n");
+ Pike_error("PHP5.Interpreter->run: Bad argument 4, expected function.\n");
add_ref(request_data);
add_ref(my_fd_obj);
add_ref(script);
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index 6d5e4bb..ef36a5e 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -78,12 +78,12 @@ AC_ARG_WITH(caudium,
AC_MSG_RESULT(not found)
fi
else
- AC_MSG_ERROR(Caudium PHP4 requires Pike 7.0 or newer)
+ AC_MSG_ERROR(Caudium PHP5 requires Pike 7.0 or newer)
fi
PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
AC_DEFINE(HAVE_CAUDIUM,1,[Whether to compile with Caudium support])
PHP_SELECT_SAPI(caudium, shared, caudium.c)
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP5.so"
RESULT=" *** Pike binary used: $PIKE
*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
*** Pike version: $PIKE_VERSION"
diff --git a/sapi/cgi/README.FastCGI b/sapi/cgi/README.FastCGI
index c2952c0..f51ae56 100644
--- a/sapi/cgi/README.FastCGI
+++ b/sapi/cgi/README.FastCGI
@@ -69,7 +69,7 @@ a line in your config like:
Don't load mod_php, by the way. Make sure it is commented out!
- #LoadModule php4_module /usr/lib/apache/2.0/libphp4.so
+ #LoadModule php5_module /usr/lib/apache/2.0/libphp5.so
Now, we'll create a fcgi-bin directory, just like you would do with normal
CGI scripts. You'll need to create a directory somewhere to store your
diff --git a/sapi/continuity/capi.c b/sapi/continuity/capi.c
index 5e3c5e9..00fca27 100644
--- a/sapi/continuity/capi.c
+++ b/sapi/continuity/capi.c
@@ -19,7 +19,7 @@
/* For more information on Continuity: http://www.ashpool.com/ */
/*
- * This code is based on the PHP4 SAPI module for NSAPI by Jayakumar
+ * This code is based on the PHP5 SAPI module for NSAPI by Jayakumar
* Muthukumarasamy
*/
diff --git a/sapi/embed/php4embed.dsp b/sapi/embed/php5embed.dsp
index d251fca..8564b11 100644
--- a/sapi/embed/php4embed.dsp
+++ b/sapi/embed/php5embed.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="php4embed" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5embed" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=php4embed - Win32 Debug_TS
+CFG=php5embed - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4embed.mak".
+!MESSAGE NMAKE /f "php5embed.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4embed.mak" CFG="php4embed - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5embed.mak" CFG="php5embed - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4embed - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "php4embed - Win32 Release_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "php5embed - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
+!MESSAGE "php5embed - Win32 Release_TS" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=php4embed - Win32 Debug_TS
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4embed - Win32 Debug_TS"
+!IF "$(CFG)" == "php5embed - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -49,9 +49,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\Debug_TS\php4embed.lib"
+# ADD LIB32 /nologo /out:"..\..\Debug_TS\php5embed.lib"
-!ELSEIF "$(CFG)" == "php4embed - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5embed - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -72,14 +72,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\Release_TS\php4embed.lib"
+# ADD LIB32 /nologo /out:"..\..\Release_TS\php5embed.lib"
!ENDIF
# Begin Target
-# Name "php4embed - Win32 Debug_TS"
-# Name "php4embed - Win32 Release_TS"
+# Name "php5embed - Win32 Debug_TS"
+# Name "php5embed - Win32 Release_TS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 8e0c4bc..dbb80ee 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -16,7 +16,7 @@ AC_ARG_WITH(isapi,
PHP_BUILD_THREAD_SAFE
AC_DEFINE(WITH_ZEUS,1,[ ])
PHP_ADD_INCLUDE($ZEUSPATH/web/include)
- PHP_SELECT_SAPI(isapi, shared, php4isapi.c)
+ PHP_SELECT_SAPI(isapi, shared, php5isapi.c)
INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/"
RESULT=yes
])
diff --git a/sapi/isapi/config.w32 b/sapi/isapi/config.w32
index 1a6cfd3..13d0e01 100644
--- a/sapi/isapi/config.w32
+++ b/sapi/isapi/config.w32
@@ -8,6 +8,6 @@ if (PHP_ISAPI == "yes") {
ERROR("ISAPI module requires an --enable-zts build of PHP");
}
- SAPI('isapi', 'php4isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP4ISAPI_EXPORTS');
- ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php4isapi.def');
+ SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS');
+ ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def');
}
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php5isapi.c
index b0d1366..b0d1366 100644
--- a/sapi/isapi/php4isapi.c
+++ b/sapi/isapi/php5isapi.c
diff --git a/sapi/isapi/php4isapi.def b/sapi/isapi/php5isapi.def
index 596023e..596023e 100644
--- a/sapi/isapi/php4isapi.def
+++ b/sapi/isapi/php5isapi.def
diff --git a/sapi/isapi/php4isapi.dsp b/sapi/isapi/php5isapi.dsp
index 7913ec6..3dbab11 100644
--- a/sapi/isapi/php4isapi.dsp
+++ b/sapi/isapi/php5isapi.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4isapi" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5isapi" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4isapi - Win32 Debug_TS
+CFG=php5isapi - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4isapi.mak".
+!MESSAGE NMAKE /f "php5isapi.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4isapi.mak" CFG="php4isapi - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5isapi.mak" CFG="php5isapi - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4isapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4isapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4isapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4isapi - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5isapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5isapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5isapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5isapi - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4isapi - Win32 Debug_TS"
+!IF "$(CFG)" == "php5isapi - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -44,8 +44,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D "COMPILE_LIBZEND" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D "COMPILE_LIBZEND" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"
-!ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5isapi - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -70,8 +70,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -81,14 +81,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
-!ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5isapi - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4isapi___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4isapi___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5isapi___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5isapi___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -97,8 +97,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS_inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5isapi - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4isapi___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4isapi___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5isapi___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5isapi___Win32_Release_TSDbg"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -124,8 +124,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TSDbg"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -134,27 +134,27 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:4.0 /dll /debug /machine:I386 /libpath:"..\..\Release_TSDbg"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib /nologo /version:4.0 /dll /debug /machine:I386 /libpath:"..\..\Release_TSDbg"
!ENDIF
# Begin Target
-# Name "php4isapi - Win32 Debug_TS"
-# Name "php4isapi - Win32 Release_TS"
-# Name "php4isapi - Win32 Release_TS_inline"
-# Name "php4isapi - Win32 Release_TSDbg"
+# Name "php5isapi - Win32 Debug_TS"
+# Name "php5isapi - Win32 Release_TS"
+# Name "php5isapi - Win32 Release_TS_inline"
+# Name "php5isapi - Win32 Release_TSDbg"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\php4isapi.c
+SOURCE=.\php5isapi.c
# End Source File
# Begin Source File
-SOURCE=.\php4isapi.def
+SOURCE=.\php5isapi.def
# End Source File
# End Group
# Begin Group "Header Files"
diff --git a/sapi/isapi/stresstest/notes.txt b/sapi/isapi/stresstest/notes.txt
index 2bab38d..f58ab3c 100644
--- a/sapi/isapi/stresstest/notes.txt
+++ b/sapi/isapi/stresstest/notes.txt
@@ -44,7 +44,7 @@ Run: stresstest L files.txt
supply the path to the parent of the "tests" directory (expect a couple
long pauses for a couple of the larger tests)
-Run: stresstest T c:\php4-source
+Run: stresstest T c:\php5-source
diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp
index bf268f4..c7e634c 100644
--- a/sapi/isapi/stresstest/stresstest.cpp
+++ b/sapi/isapi/stresstest/stresstest.cpp
@@ -529,7 +529,7 @@ int main(int argc, char* argv[])
0,
NULL
);
- fprintf(stderr,"Error: Dll 'php4isapi.dll' not found -%d\n%s\n", GetLastError(), lpMsgBuf);
+ fprintf(stderr,"Error: Dll 'php5isapi.dll' not found -%d\n%s\n", GetLastError(), lpMsgBuf);
free (module);
free(filelist);
LocalFree( lpMsgBuf );
diff --git a/sapi/nsapi/php4nsapi.dsp b/sapi/nsapi/php5nsapi.dsp
index 9b0b8c9..6cd0079 100644
--- a/sapi/nsapi/php4nsapi.dsp
+++ b/sapi/nsapi/php5nsapi.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4nsapi" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5nsapi" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4nsapi - Win32 Debug_TS
+CFG=php5nsapi - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4nsapi.mak".
+!MESSAGE NMAKE /f "php5nsapi.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4nsapi.mak" CFG="php4nsapi - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5nsapi.mak" CFG="php5nsapi - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4nsapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4nsapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4nsapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5nsapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5nsapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5nsapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,12 +30,12 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4nsapi - Win32 Release_TS"
+!IF "$(CFG)" == "php5nsapi - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4nsapi___Win32_Release_TS"
-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Release_TS"
+# PROP BASE Output_Dir "php5nsapi___Win32_Release_TS"
+# PROP BASE Intermediate_Dir "php5nsapi___Win32_Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,14 +54,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ns-httpd30.lib php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
+# ADD LINK32 ns-httpd30.lib php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
-!ELSEIF "$(CFG)" == "php4nsapi - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5nsapi - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4nsapi___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5nsapi___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5nsapi___Win32_Release_TS_inline"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -80,14 +80,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ns-httpd30.lib php4ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
+# ADD LINK32 ns-httpd30.lib php5ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4nsapi - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5nsapi - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "php4nsapi___Win32_Debug_TS"
-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Debug_TS"
+# PROP BASE Output_Dir "php5nsapi___Win32_Debug_TS"
+# PROP BASE Intermediate_Dir "php5nsapi___Win32_Debug_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
@@ -95,8 +95,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_DEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_DEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php5nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -106,15 +106,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ns-httpd30.lib php4ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
+# ADD LINK32 ns-httpd30.lib php5ts_debug.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x62000000" /version:4.0 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
!ENDIF
# Begin Target
-# Name "php4nsapi - Win32 Release_TS"
-# Name "php4nsapi - Win32 Release_TS_inline"
-# Name "php4nsapi - Win32 Debug_TS"
+# Name "php5nsapi - Win32 Release_TS"
+# Name "php5nsapi - Win32 Release_TS_inline"
+# Name "php5nsapi - Win32 Debug_TS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/sapi/pi3web/README b/sapi/pi3web/README
index 8d7e9dc..e3e523e 100644
--- a/sapi/pi3web/README
+++ b/sapi/pi3web/README
@@ -1,36 +1,36 @@
-PHP4 Module
+PHP5 Module
==========
-This module requires PHP4 as thread safe shared library. Have a look
+This module requires PHP5 as thread safe shared library. Have a look
into the INSTALL file which accompanies that distribution.
If you distribute this software bundled with the PHP software in source
or binary form, then you must adhere to the PHP copyright conditions -
the terms are reasonable.
-You should have checked out and built the PHP4 source package from the
-PHP CVS tree into the Pi3Web source directory called 'PHP4' first. Then
-build PHP4 as Pi3Web module and after that build the Pi3Web PHP4 wrapper:
+You should have checked out and built the PHP5 source package from the
+PHP CVS tree into the Pi3Web source directory called 'PHP5' first. Then
+build PHP5 as Pi3Web module and after that build the Pi3Web PHP5 wrapper:
-1. Checkout PHP4
+1. Checkout PHP5
================
cvs -d :pserver:cvsread@cvs.php.net:/repository login
The required password is phpfi
-cvs -z3 -d :pserver:cvsread@cvs.php.net:/repository co php4
+cvs -z3 -d :pserver:cvsread@cvs.php.net:/repository co php5
You must also checkout the TSRM and the ZEND module from the ZEND cvs tree
-into the PHP4 root directory
+into the PHP5 root directory
cvs -d :pserver:cvsread@cvs.zend.com:/repository login
The required password is zend
cvs -z3 -d :pserver:cvsread@cvs.zend.com:/repository co Zend TSRM
-2. Build PHP4
+2. Build PHP5
=============
2.1 POSIX
---------
-cd ./php4
+cd ./php5
./buildconf
./configure --with-pi3web
make
@@ -41,10 +41,10 @@ other required downloads from the php website
- bison 1.25
- bindlib32
- number4.tar.gz
-nmake php4dllts.mak
+nmake php5dllts.mak
-3. Build Pi3Web PHP4 wrapper
+3. Build Pi3Web PHP5 wrapper
============================
-Run make in the Pi3Web /Source/PHP4 directory.
+Run make in the Pi3Web /Source/PHP5 directory.
For further information refer to http://www.php.net/version4/
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 325aac2..ba6a166 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -20,7 +20,7 @@ if test "$withval" != "no"; then
PHP_ADD_INCLUDE($PI3PATH/PiAPI)
PHP_ADD_INCLUDE($PI3PATH/Pi2API)
PHP_ADD_INCLUDE($PI3PATH/Pi3API)
- PHP_ADD_INCLUDE($PI3PATH/PHP4)
+ PHP_ADD_INCLUDE($PI3PATH/PHP5)
PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c)
INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/"
RESULT=yes
diff --git a/sapi/pi3web/config.w32 b/sapi/pi3web/config.w32
index 38fae95..a5393e6 100644
--- a/sapi/pi3web/config.w32
+++ b/sapi/pi3web/config.w32
@@ -8,7 +8,7 @@ if (PHP_PI3WEB != "no") {
CHECK_LIB('piapi.lib', 'pi3web', PHP_PHP_BUILD + "\\Pi3Web\\lib;" + PHP_PI3WEB) &&
CHECK_LIB('pi2api.lib', 'pi3web', PHP_PHP_BUILD + "\\Pi3Web\\lib;" + PHP_PI3WEB) &&
CHECK_LIB('pi3api.lib', 'pi3web', PHP_PHP_BUILD + "\\Pi3Web\\lib;" + PHP_PI3WEB)) {
- SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll', '/D PHP4PI3WEB_EXPORTS');
+ SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll', '/D PHP5PI3WEB_EXPORTS');
AC_DEFINE('WITH_PI3WEB', 1);
} else {
WARNING('Pi3Web not enabled; headers/libraries not found');
diff --git a/sapi/pi3web/php4pi3web.dsp b/sapi/pi3web/php5pi3web.dsp
index 2e5bdda..3ba5224 100644
--- a/sapi/pi3web/php4pi3web.dsp
+++ b/sapi/pi3web/php5pi3web.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4pi3web" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5pi3web" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4pi3web - Win32 Debug_TS
+CFG=php5pi3web - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4pi3web.mak".
+!MESSAGE NMAKE /f "php5pi3web.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4pi3web.mak" CFG="php4pi3web - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5pi3web.mak" CFG="php5pi3web - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4pi3web - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4pi3web - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4pi3web - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5pi3web - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5pi3web - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5pi3web - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4pi3web - Win32 Debug_TS"
+!IF "$(CFG)" == "php5pi3web - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4pi3web_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP4PI3WEB_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php5pi3web_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP5PI3WEB_EXPORTS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts_debug.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php5ts_debug.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /pdbtype:sept /libpath:"..\..\Debug_TS"
-!ELSEIF "$(CFG)" == "php4pi3web - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5pi3web - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4pi3web_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP4PI3WEB_EXPORTS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php5pi3web_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP5PI3WEB_EXPORTS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -80,14 +80,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /libpath:"..\..\Release_TS"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /libpath:"..\..\Release_TS"
-!ELSEIF "$(CFG)" == "php4pi3web - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5pi3web - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4pi3web___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4pi3web___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5pi3web___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5pi3web___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -96,8 +96,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\..\..\PiAPI" /I "..\..\..\Pi2API" /I "..\..\..\Pi3API" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP4PI3WEB_EXPORTS" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\..\..\PiAPI" /I "..\..\..\Pi2API" /I "..\..\..\Pi3API" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP5PI3WEB_EXPORTS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -106,16 +106,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" /libpath:"..\..\..\PiAPI" /libpath:"..\..\..\Pi2API" /libpath:"..\..\..\Pi3API"
-# ADD LINK32 php4ts.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /libpath:"..\..\Release_TS_inline"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php5ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" /libpath:"..\..\..\PiAPI" /libpath:"..\..\..\Pi2API" /libpath:"..\..\..\Pi3API"
+# ADD LINK32 php5ts.lib kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib PiAPI.lib Pi2API.lib Pi3API.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /libpath:"..\..\Release_TS_inline"
!ENDIF
# Begin Target
-# Name "php4pi3web - Win32 Debug_TS"
-# Name "php4pi3web - Win32 Release_TS"
-# Name "php4pi3web - Win32 Release_TS_inline"
+# Name "php5pi3web - Win32 Debug_TS"
+# Name "php5pi3web - Win32 Release_TS"
+# Name "php5pi3web - Win32 Release_TS_inline"
# Begin Group "Source Files"
# PROP Default_Filter ".c"
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index a13ab70..1a6d36f 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -386,7 +386,7 @@ static sapi_module_struct pi3web_sapi_module = {
STANDARD_SAPI_MODULE_PROPERTIES
};
-MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
+MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB)
{
zend_file_handle file_handle;
int iRet = PIAPI_COMPLETED;
@@ -455,7 +455,7 @@ MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
return iRet;
}
-MODULE_API BOOL PHP4_startup() {
+MODULE_API BOOL PHP5_startup() {
tsrm_startup(1, 1, 0, NULL);
sapi_startup(&pi3web_sapi_module);
if (pi3web_sapi_module.startup) {
@@ -465,7 +465,7 @@ MODULE_API BOOL PHP4_startup() {
return IWasLoaded;
};
-MODULE_API BOOL PHP4_shutdown() {
+MODULE_API BOOL PHP5_shutdown() {
if (pi3web_sapi_module.shutdown) {
pi3web_sapi_module.shutdown(&pi3web_sapi_module);
};
diff --git a/sapi/pi3web/pi3web_sapi.h b/sapi/pi3web/pi3web_sapi.h
index d1c38d7..c358518 100644
--- a/sapi/pi3web/pi3web_sapi.h
+++ b/sapi/pi3web/pi3web_sapi.h
@@ -4,7 +4,7 @@
#ifdef PHP_WIN32
# include <windows.h>
# include <httpext.h>
-# ifdef PHP4PI3WEB_EXPORTS
+# ifdef PHP5PI3WEB_EXPORTS
# define MODULE_API __declspec(dllexport)
# else
# define MODULE_API __declspec(dllimport)
@@ -79,9 +79,9 @@ typedef struct _CONTROL_BLOCK {
} CONTROL_BLOCK, *LPCONTROL_BLOCK;
-MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB);
-MODULE_API BOOL PHP4_startup();
-MODULE_API BOOL PHP4_shutdown();
+MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB);
+MODULE_API BOOL PHP5_startup();
+MODULE_API BOOL PHP5_shutdown();
// the following type declaration is for the server side
typedef DWORD ( * PFN_WRAPPERFUNC )( CONTROL_BLOCK *pCB );
diff --git a/sapi/roxen/README b/sapi/roxen/README
index c6ec30d..d834a00 100644
--- a/sapi/roxen/README
+++ b/sapi/roxen/README
@@ -8,9 +8,9 @@ script is executed at any one time). The second option is using ZTS
(Zend Thread Safe mode). Unless --enable-roxen-zts is specified, this
won't be used.
-This solution now works fine and is recommended. Multiple PHP4
+This solution now works fine and is recommended. Multiple PHP5
requests will be run in parallell. The maximum number of parallell
-PHP4-execution is limited to the number of handle threads Roxen is
+PHP5-execution is limited to the number of handle threads Roxen is
started with.
Support for this module is lacking. Please contact Roxen Internet
diff --git a/sapi/roxen/TODO b/sapi/roxen/TODO
index 4ba171a..248f36f 100644
--- a/sapi/roxen/TODO
+++ b/sapi/roxen/TODO
@@ -10,18 +10,18 @@ BUGS:
And another error (when trying to include a class)
Recursive mutex locks!
- /Usr/local/pike/7.0.54/lib/modules/PHP4.so.Interpreter:
- run("/home/www/www.tx.pl/news/test.php",mapping[3],modules/scripting/php4.pike.PHPScript(),modules/scripting/php4.pike.PHPScript.done)
- modules/scripting/php4.pike:169: run()
+ /Usr/local/pike/7.0.54/lib/modules/PHP5.so.Interpreter:
+ run("/home/www/www.tx.pl/news/test.php",mapping[3],modules/scripting/php5.pike.PHPScript(),modules/scripting/php5.pike.PHPScript.done)
+ modules/scripting/php5.pike:169: run()
base_server/roxen.pike:569: handler_thread(3).
And after this every access to any php script (on other virtual sites
also) ends (of course there is no proper output) with this error:
Php4.Interpreter->run: Tried to run a PHP-script from a PHP
- callback!/usr/local/pike/7.0.54/lib/modules/PHP4.so.Interpreter:
- run("/home/www/biall.com.pl/index.php3",mapping[2],modules/scripting/php4.pike.PHPScript(),modules/scripting/php4.pike.PHPScript.done)
- modules/scripting/php4.pike:169: run()
+ callback!/usr/local/pike/7.0.54/lib/modules/PHP5.so.Interpreter:
+ run("/home/www/biall.com.pl/index.php3",mapping[2],modules/scripting/php5.pike.PHPScript(),modules/scripting/php5.pike.PHPScript.done)
+ modules/scripting/php5.pike:169: run()
base_server/roxen.pike:569: handler_thread(3).
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index cf2726b..6634964 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -31,7 +31,7 @@ AC_ARG_WITH(roxen,
PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR)
AC_DEFINE(HAVE_ROXEN,1,[Whether you use Roxen])
PHP_SELECT_SAPI(roxen, shared, roxen.c)
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP4.so"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP5.so"
RESULT="yes
Pike binary used: $PIKE
Pike include dir: $PIKE_INCLUDE_DIR
diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index d580fe3..c0ec83f 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -615,12 +615,12 @@ void f_php_roxen_request_handler(INT32 args)
TSRMLS_FETCH();
if(current_thread == th_self())
- php_error(E_WARNING, "PHP4.Interpreter->run: Tried to run a PHP-script from a PHP "
+ php_error(E_WARNING, "PHP5.Interpreter->run: Tried to run a PHP-script from a PHP "
"callback!");
- get_all_args("PHP4.Interpreter->run", args, "%S%m%O%*", &script,
+ get_all_args("PHP5.Interpreter->run", args, "%S%m%O%*", &script,
&request_data, &my_fd_obj, &done_callback);
if(done_callback->type != PIKE_T_FUNCTION)
- php_error(E_WARNING, "PHP4.Interpreter->run: Bad argument 4, expected function.\n");
+ php_error(E_WARNING, "PHP5.Interpreter->run: Bad argument 4, expected function.\n");
PHP_LOCK(THIS); /* Need to lock here or reusing the same object might cause
* problems in changing stuff in that object */
#ifndef ROXEN_USE_ZTS
@@ -656,7 +656,7 @@ void f_php_roxen_request_handler(INT32 args)
{
int fd = fd_from_object(raw_fd->u.object);
if(fd == -1)
- php_error(E_WARNING, "PHP4.Interpreter->run: my_fd object not open or not an FD.\n");
+ php_error(E_WARNING, "PHP5.Interpreter->run: my_fd object not open or not an FD.\n");
THIS->my_fd = fd;
} else
THIS->my_fd = 0;
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index 9236677..ac5a2bf 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -21,10 +21,10 @@ AC_ARG_WITH(thttpd,
fi
PHP_TARGET_RDYNAMIC
INSTALL_IT="\
- echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \
+ echo 'PHP_LIBS = -L. -lphp5 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \
echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \
echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \
- rm -f $THTTPD/php_thttpd.c $THTTPD/php_thttpd.h $THTTPD/libphp4.a; \
+ rm -f $THTTPD/php_thttpd.c $THTTPD/php_thttpd.h $THTTPD/libphp5.a; \
\$(LN_S) $abs_srcdir/sapi/thttpd/thttpd.c $THTTPD/php_thttpd.c; \
\$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\
$patch"
diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch
index 482cad4..33de921 100644
--- a/sapi/thttpd/thttpd_patch
+++ b/sapi/thttpd/thttpd_patch
@@ -34,7 +34,7 @@ diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in
this: $(ALL)
-thttpd: $(OBJ)
-+thttpd: $(OBJ) libphp4.a
++thttpd: $(OBJ) libphp5.a
@rm -f $@
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(NETLIBS)
diff --git a/sapi/tux/README b/sapi/tux/README
index 167e52f..92c0211 100644
--- a/sapi/tux/README
+++ b/sapi/tux/README
@@ -56,31 +56,31 @@ BUILD INSTRUCTIONS
$ ./configure --help
- 3. Touch a file in your web-root 'php4.tux'. This will
- cause requests to '/php4.tux' to be redirected to the
- userspace module php4.tux.
+ 3. Touch a file in your web-root 'php5.tux'. This will
+ cause requests to '/php5.tux' to be redirected to the
+ userspace module php5.tux.
4. Start TUX with something like
- # tux -d -t 8 -r /www -m /tux-modules php4.tux
+ # tux -d -t 8 -r /www -m /tux-modules php5.tux
(daemon mode, eight threads, web-root /www, modules in
- /tux-modules, load php4.tux)
+ /tux-modules, load php5.tux)
BEFORE running this command, the kernel side of TUX has to
be properly setup.
5. Try to access
- http://yourserver/php4.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000
+ http://yourserver/php5.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000
It should display the PHP credits page.
To access a script /foo/bar.php, use
- http://yourserver/php4.tux?/foo/bar.php
+ http://yourserver/php5.tux?/foo/bar.php
Parameters can be appended:
- http://yourserver/php4.tux?/foo/bar.php&var=value
+ http://yourserver/php5.tux?/foo/bar.php&var=value
diff --git a/sapi/tux/config.m4 b/sapi/tux/config.m4
index ea12e67..cc79bea 100644
--- a/sapi/tux/config.m4
+++ b/sapi/tux/config.m4
@@ -6,7 +6,7 @@ PHP_TUX=no
AC_ARG_WITH(tux,
[ --with-tux=MODULEDIR Build PHP as a TUX module (Linux only)],[
- INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/php4.tux.so"
+ INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/php5.tux.so"
AC_CHECK_HEADERS(tuxmodule.h,[:],[AC_MSG_ERROR([Cannot find tuxmodule.h])])
PHP_SELECT_SAPI(tux, shared, php_tux.c)
PHP_TUX=yes
diff --git a/sapi/webjames/README b/sapi/webjames/README
index 9a316ef..746a776 100644
--- a/sapi/webjames/README
+++ b/sapi/webjames/README
@@ -16,7 +16,7 @@ http://www.webjames.alexwaugh.com/
BUILDING
-$ cd php4
+$ cd php5
$ ./configure \
--host=arm-riscos-aof \
--with-webjames=../webjames/src \
diff --git a/scripts/dev/credits b/scripts/dev/credits
index b76fb31..0ea312d 100755
--- a/scripts/dev/credits
+++ b/scripts/dev/credits
@@ -10,9 +10,9 @@ do
/*
DO NOT EDIT THIS FILE!
- it has been automaticaly created by php4/scripts/credits from
- the information found in the various php4/ext/.../CREDITS and
- php4/sapi/.../CREDITS files
+ it has been automaticaly created by php5/scripts/credits from
+ the information found in the various php5/ext/.../CREDITS and
+ php5/sapi/.../CREDITS files
if you want to change an entry you have to edit the appropriate
CREDITS file instead
diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt
index 6baa575..a5688bb 100755
--- a/tests/classes/inheritance_002.phpt
+++ b/tests/classes/inheritance_002.phpt
@@ -52,10 +52,10 @@ class Child_mx2 extends Base_php5 {
}
}
-echo "### PHP4 style\n";
+echo "### PHP 4 style\n";
$c4= new Child_php4();
-echo "### PHP5 style\n";
+echo "### PHP 5 style\n";
$c5= new Child_php5();
echo "### Mixed style 1\n";
@@ -65,10 +65,10 @@ echo "### Mixed style 2\n";
$cm= new Child_mx2();
?>
--EXPECT--
-### PHP4 style
+### PHP 4 style
string(17) "Child constructor"
string(16) "Base constructor"
-### PHP5 style
+### PHP 5 style
string(17) "Child constructor"
string(16) "Base constructor"
### Mixed style 1
diff --git a/tests/test.php4 b/tests/test.php4
deleted file mode 100644
index 7af9a28..0000000
--- a/tests/test.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?
-function blah($a)
-{
- return $a;
-}
-
-return "cool";
-
-
-for ($for=0; $for<=100000;$for++)
-{
-if ("andi" != blah("andi"))
-{
-print "error";}
-}
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index b56ba24..457b8dc 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -32,7 +32,7 @@ DEFINE('PHP_PREFIX', PHP_PREFIX);
DEFINE("BASE_INCLUDES", "/I . /I main /I regex /I Zend /I TSRM ");
// CFLAGS for building the PHP dll
-DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP4DLLTS_EXPORTS /D PHP_EXPORTS \
+DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400");
DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
diff --git a/win32/install.txt b/win32/install.txt
index 8af4c96..9374570 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -54,9 +54,9 @@ Windows Manual installation from zip binary distribution
Xitami
SunONE Webserver, Netscape Enterprise Server, iPlanet
- PHP 4 for Windows comes in two flavours - a CGI executable (php.exe),
- and several SAPI modules (for exapmle php4isapi.dll). The latter form
- is new to PHP 4, and provides significantly improved performance and
+ PHP for Windows comes in two flavours - a CGI executable (php.exe),
+ and several SAPI modules (for exapmle php5isapi.dll). The latter form
+ is new to PHP, and provides significantly improved performance and
some new functionality. However, please note that the SAPI modules
are *NOT* yet considered to be production quality.
In particular, with the ISAPI module, you are likely to encounter serious
@@ -65,7 +65,7 @@ Windows Manual installation from zip binary distribution
such as ASP also failing. You have been warned!
The reason for this is that the PHP SAPI modules are using the
- thread-safe version of the PHP code, which is new to PHP 4, and has
+ thread-safe version of the PHP code, which is new to PHP, and has
not yet been tested and pounded enough to be considered completely
stable, and there are actually a few known bugs. On the other hand,
some people have reported very good results with the SAPI modules,
@@ -90,14 +90,14 @@ Windows Manual installation from zip binary distribution
You need to ensure that the dlls which php uses can be found. The precise
dlls involved depend on which web server you use and whether you want to
- run php as a cgi or as a server module. php4ts.dll is always used. If you are
+ run php as a cgi or as a server module. php5ts.dll is always used. If you are
using a server module (e.g. isapi or apache) then you will need the relevent
dll from the sapi folder. If you are using any php extension dlls then you
will need those as well. To make sure that the dlls can be found, you can
either copy them to the system directory (e.g. winnt/system32 or
windows/system) or you can make sure that they live in the same directory
as the main php executable or dll your web server will use (e.g. php.exe,
- php4apache.dll).
+ php5apache.dll).
Copy the file, php.ini-dist to your %WINDOWS% directory on
Windows 95/98 or to your %SYSTEMROOT% directory under Windows NT,
@@ -178,7 +178,7 @@ Installation of Windows extensions
libraries.
Note:
- In PHP 4.0.5 MySQL, ODBC, FTP, Calendar, BCMath, COM, PCRE,
+ Since PHP 4.0.5 MySQL, ODBC, FTP, Calendar, BCMath, COM, PCRE,
Session, WDDX and XML support is built-in. You don't need to
load any additional extensions in order to use these functions.
@@ -214,7 +214,7 @@ Web server configuration
http://www.php.net/manual/en/install.apache2.php
With the basic difference being that when installing as a
- module you'll use php4apache2.dll instead of php4apache.dll
+ module you'll use php5apache2.dll instead of php5apache.dll
Both files are included within this release.
------------------------------------------------------------
@@ -239,24 +239,24 @@ Web server configuration
Now that version 4.1 introduces a safer sapi module, we recommend
that you configure PHP as a module in Apache.
- To accomplish this, you have to load the php4apache.dll in your
+ To accomplish this, you have to load the php5apache.dll in your
Apache httpd.conf.
!! NOTE !!
- Whereever you load php4apache.dll from, php4apache.dll also
- needs the php4ts.dll also included in the PHP4 distribution.
- php4apache.dll depends on php4ts.dll which is loaded as soon as
- Apache loads php4apache.dll. If php4ts.dll can't be found, you
+ Whereever you load php5apache.dll from, php5apache.dll also
+ needs the php5ts.dll also included in the PHP distribution.
+ php5apache.dll depends on php5ts.dll which is loaded as soon as
+ Apache loads php5apache.dll. If php5ts.dll can't be found, you
usually get an error like (also see the "Problems?" section at
the end of the file):
- Cannot load c:/php/sapi/php4apache.dll into server
+ Cannot load c:/php/sapi/php5apache.dll into server
- So where does php4ts.dll has to be to be properly loaded ?
- php4ts.dll is searched in the following order:
+ So where does php5ts.dll has to be to be properly loaded ?
+ php5ts.dll is searched in the following order:
1) in the directory where apache.exe is start from
- 2) in the directory where php4apache.dll is loaded from
+ 2) in the directory where php5apache.dll is loaded from
3) in your %SYSTEMROOT%\System32, %SYSTEMROOT%\system and
%SYSTEMROOT% directory.
Note: %SYSTEMROOT%\System32 only applies to Windows NT/2000/XP)
@@ -268,15 +268,15 @@ Web server configuration
Usually you would just copy it over to %SYSTEMROOT%\System32.
But if you want to have multiple PHP installations (for
whatever reason) this is a bad idea. For this circumstance the
- safest thing is to let php4ts.dll reside in the same directory
- where php4apache.dll is loaded from (see point 2 above).
+ safest thing is to let php5ts.dll reside in the same directory
+ where php5apache.dll is loaded from (see point 2 above).
After you've set up the file layout properly, you're ready to
- finally configure Apache to load the PHP4 module. Just add the
+ finally configure Apache to load the PHP module. Just add the
following lines to your httpd.conf:
- LoadModule php5_module c:/php/sapi/php4apache.dll
+ LoadModule php5_module c:/php/sapi/php5apache.dll
AddModule mod_php5.c
AddType application/x-httpd-php .php
@@ -329,15 +329,15 @@ Web server configuration
On Win-Apache, path names can contain either forward- or backslashes.
Example:
- LoadModule php5_module C:\php\sapi\php4apache.dll
+ LoadModule php5_module C:\php\sapi\php5apache.dll
works as good as
- LoadModule php5_module C:/php/sapi/php4apache.dll
+ LoadModule php5_module C:/php/sapi/php5apache.dll
You even can mix the slash-style:
- LoadModule php5_module C:\php/sapi\php4apache.dll
+ LoadModule php5_module C:\php/sapi\php5apache.dll
----------------------------------------------------------
@@ -350,7 +350,7 @@ Web server configuration
Windows and PWS/IIS 3 - including PWS on Win 9x/ME
The recommended method for configuring these servers is to use
- the REG file incuded with the distribution (pws-php4cgi.reg).
+ the REG file incuded with the distribution (pws-php5cgi.reg).
You may want to edit this file and make sure the extensions and PHP
install directories match your configuration - once you have done
this, just double click on the file and it will update your registry.
@@ -466,11 +466,11 @@ Web server configuration
If you don't want to perform HTTP Authentication using PHP,
you can (and should) skip this step. Under ISAPI Filters,
add a new ISAPI filter. Use PHP as the filter name, and
- supply a path to the php4isapi.dll.
+ supply a path to the php5isapi.dll.
Under 'Home Directory', click on the 'Configuration' button.
Add a new entry to the Application Mappings. Use the path
- to the php4isapi.dll as the Executable, supply .php as the
+ to the php5isapi.dll as the Executable, supply .php as the
extension, leave Method exclusions blank, and check the
Script engine checkbox.
@@ -524,7 +524,7 @@ Web server configuration
From the List select "Associations" and enter the desired
extension (".php") and the path to the CGI exe (ex. c:\php\php.exe)
- or the ISAPI dll file (ex. c:\php\sapi\php4isapi.dll).
+ or the ISAPI dll file (ex. c:\php\sapi\php5isapi.dll).
Select "Content Types" add the same extension ".php"
and enter the content type. If you choose the CGI exe
@@ -623,7 +623,7 @@ Web server configuration
Open mappings.ini and add the following line under [isapi]
- *.php = c:\php\php4isapi.dll
+ *.php = c:\php\php5isapi.dll
Note: The above assumes that PHP was installed in c:\php
Restart the server
@@ -685,7 +685,7 @@ Problems?
Once php is working at the command line, try accessing the php script via the browser again.
If it still fails then it could be one of the following:
- file permissions on your php script, php.exe, php4ts.dll, php.ini or any php
+ file permissions on your php script, php.exe, php5ts.dll, php.ini or any php
extensions you are trying to load are such that the web server cannot access
them. For IIS, IUSR_<machinename> needs at least read access.
@@ -708,18 +708,18 @@ Problems?
Example scenery:
- Apache/PHP4 as module. Though I've properly configured
- php4apache.dll in httpd.conf, I always get:
+ Apache/PHP as module. Though I've properly configured
+ php5apache.dll in httpd.conf, I always get:
Syntax error on line 1025 of c:/apache/apache/conf/httpd.conf:
- Cannot load c:/php/php-4.2.1-win32/sapi/php4apache.dll into server
+ Cannot load c:/php/php-4.2.1-win32/sapi/php5apache.dll into server
- But c:/php/php-4.2.1-win32/sapi/php4apache.dll definitely
+ But c:/php/php-4.2.1-win32/sapi/php5apache.dll definitely
exists:
- dir c:\php\php-4.2.1-win32\sapi\php4apache.dll
+ dir c:\php\php-4.2.1-win32\sapi\php5apache.dll
Directory of c:\php\php-4.2.1-win32\sapi
- 13.05.2002 00:01 24.576 php4apache.dll
+ 13.05.2002 00:01 24.576 php5apache.dll
'strace'ing the apache.exe binary revealed the following:
c:
@@ -728,18 +728,18 @@ Problems?
Then looking into strace.txt:
[...]
-729 3348 3248 NtOpenSection (0xe, {24, 24, 0x40, 0, 0, "php4ts.dll"}, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-731 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\c:\php\php-4.2.1-win32\sapi\php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-733 3348 3248 NtQueryAttributesFile ({24, 108, 0x40, 0, 0, "php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
-735 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\C:\WINNT\System32\php4ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+729 3348 3248 NtOpenSection (0xe, {24, 24, 0x40, 0, 0, "php5ts.dll"}, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+731 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\c:\php\php-4.2.1-win32\sapi\php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+733 3348 3248 NtQueryAttributesFile ({24, 108, 0x40, 0, 0, "php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
+735 3348 3248 NtQueryAttributesFile ({24, 0, 0x40, 0, 0, "\??\C:\WINNT\System32\php5ts.dll"}, 1234824, ... ) == STATUS_OBJECT_NAME_NOT_FOUND
[...]
This went on quiet some time for all directories in the %PATH%
environment variable. The solution finally was to copy
- php4ts.dll in any of the directories searched by the System (I
+ php5ts.dll in any of the directories searched by the System (I
prefered to use c:\php\php-4.2.1-win32\sapi).
- Note: This does not only apply to php4ts.dll but in fact to every
+ Note: This does not only apply to php5ts.dll but in fact to every
DLL which gets loaded through PHP too. So, if you've
problems running your PHP CLI application because it
can't load a certain library but you're sure it's there,
diff --git a/win32/installer/README b/win32/installer/README
index 4c79b9a..0879497 100644
--- a/win32/installer/README
+++ b/win32/installer/README
@@ -14,7 +14,7 @@ Installer Layout:
We have the following features:
o PHP Core - Always installed.
- Includes php4ts.dll, php.ini + common dlls
+ Includes php5ts.dll, php.ini + common dlls
and config files
o SAPI
diff --git a/win32/installer/gen-nsis.php b/win32/installer/gen-nsis.php
index 7e9938f..da94264 100644
--- a/win32/installer/gen-nsis.php
+++ b/win32/installer/gen-nsis.php
@@ -22,7 +22,7 @@ $sections = array(
"files" => array(
"$SYSDIR" => array(
"dlls\\*.dll",
- "php4ts.dll",
+ "php5ts.dll",
),
"\$INSTDIR" => array(
"*.txt",
@@ -42,7 +42,7 @@ $sections = array(
"php.exe"
),
"\$INSTDIR\\sapi" => array(
- "sapi\\pws-php4cgi.reg"
+ "sapi\\pws-php5cgi.reg"
),
),
),
@@ -171,7 +171,7 @@ function add_sections($pattern, $groupname, $abbrev, &$sections, $sourcedirs, $i
foreach ($avail as $extname) {
/* mangle name */
- if (preg_match('/(php_|php4|php)([^_].*)\.dll/', basename($extname), $matches)) {
+ if (preg_match('/(php_|php5|php)([^_].*)\.dll/', basename($extname), $matches)) {
$ext = $matches[2];
} else {
$ext = basename($extname);
@@ -388,7 +388,7 @@ Function CopyPHPIni
CopyFiles "$INSTDIR\php.ini-dist" "$WINDIR\php.ini"
; These files will be deleted during post-installation
- CopyFiles "<?= $SYSDIR ?>\php4ts.dll" "$INSTDIR\php4ts.dll"
+ CopyFiles "<?= $SYSDIR ?>\php5ts.dll" "$INSTDIR\php5ts.dll"
File "<?= dirname(__FILE__) ?>\setini.php"
; Set the extension_dir setting in the php.ini
@@ -411,7 +411,7 @@ Section -post
Delete "$INSTDIR\.ini-add" ; Created by the AddIniSetting function
Delete "$INSTDIR\setini.php"
- Delete "$INSTDIR\php4ts.dll"
+ Delete "$INSTDIR\php5ts.dll"
; Add to Add/Remove programs list
WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PHP-<?= PHPVERSION ?>" "UninstallString" "$INSTDIR\Uninstall.exe"
diff --git a/win32/php4.dsp b/win32/php5.dsp
index 1e8d7f4..0b5b9a6 100644
--- a/win32/php4.dsp
+++ b/win32/php5.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=php4 - Win32 Debug
+CFG=php5 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4.mak".
+!MESSAGE NMAKE /f "php5.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4.mak" CFG="php4 - Win32 Debug"
+!MESSAGE NMAKE /f "php5.mak" CFG="php5 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4 - Win32 Release_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5 - Win32 Release_inline" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CFG=php4 - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4 - Win32 Release"
+!IF "$(CFG)" == "php5 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -52,9 +52,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release"
+# ADD LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release"
-!ELSEIF "$(CFG)" == "php4 - Win32 Debug"
+!ELSEIF "$(CFG)" == "php5 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -77,15 +77,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"c:\php-fcgi\php.exe" /pdbtype:sept /libpath:"..\Debug"
+# ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"c:\php-fcgi\php.exe" /pdbtype:sept /libpath:"..\Debug"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "php4 - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5 - Win32 Release_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4___Win32_Release_inline"
-# PROP BASE Intermediate_Dir "php4___Win32_Release_inline"
+# PROP BASE Output_Dir "php5___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "php5___Win32_Release_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -104,16 +104,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
-# ADD LINK32 php4nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release_inline"
+# ADD BASE LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release\php.exe" /libpath:"Release"
+# ADD LINK32 php5nts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php.exe" /libpath:"..\Release_inline"
!ENDIF
# Begin Target
-# Name "php4 - Win32 Release"
-# Name "php4 - Win32 Debug"
-# Name "php4 - Win32 Release_inline"
+# Name "php5 - Win32 Release"
+# Name "php5 - Win32 Debug"
+# Name "php5 - Win32 Release_inline"
# Begin Group "Source Files"
# PROP Default_Filter ".c"
diff --git a/win32/php4.dsw b/win32/php5.dsw
index cd53cde..d6efc98 100644
--- a/win32/php4.dsw
+++ b/win32/php5.dsw
@@ -1,107 +1,107 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name TSRM
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "fastcgi"=..\sapi\fastcgi\fastcgi.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name php4dll
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name TSRM
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Zend
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "php4"=.\php4.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name php4dll
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Zend
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name TSRM
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "php4dll"=.\php4dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name Zend
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name libmysql
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name TSRM
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Zend"=..\Zend\Zend.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name TSRM
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "fastcgi"=..\sapi\fastcgi\fastcgi.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name php5dll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TSRM
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Zend
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "php5"=.\php5.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name php5dll
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Zend
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TSRM
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "php5dll"=.\php5dll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name Zend
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libmysql
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name TSRM
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/win32/php4dll.dsp b/win32/php5dll.dsp
index 882d02a..542ce05 100644
--- a/win32/php4dll.dsp
+++ b/win32/php5dll.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php4dll" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5dll" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4dll - Win32 Debug
+CFG=php5dll - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4dll.mak".
+!MESSAGE NMAKE /f "php5dll.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4dll.mak" CFG="php4dll - Win32 Debug"
+!MESSAGE NMAKE /f "php5dll.mak" CFG="php5dll - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dll - Win32 Release_inline" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -43,8 +43,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "..\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"c:\php-fcgi\php4nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib TSRM.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /nodefaultlib:"libcmtd" /out:"c:\php-fcgi\php5nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -69,8 +69,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "..\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\Zend" /I "..\regex" /I "..\..\bindlib_w32" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLL_EXPORTS" /D "PHP_EXPORTS" /D "SAPI_EXPORTS" /D "LIBZEND_EXPORTS" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -80,14 +80,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib tsrm.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php5nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dll___Win32_Release_inline"
-# PROP BASE Intermediate_Dir "php4dll___Win32_Release_inline"
+# PROP BASE Output_Dir "php5dll___Win32_Release_inline"
+# PROP BASE Intermediate_Dir "php5dll___Win32_Release_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -96,8 +96,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "..\Release_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D ZEND_DEBUG=0 /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "SAPI_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -106,16 +106,16 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php4nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php4nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/php5nts.dll" /libpath:"TSRM\Release" /libpath:"Zend\Release" /libpath:"..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Zend.lib tsrm.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release\php5nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"
!ENDIF
# Begin Target
-# Name "php4dll - Win32 Debug"
-# Name "php4dll - Win32 Release"
-# Name "php4dll - Win32 Release_inline"
+# Name "php5dll - Win32 Debug"
+# Name "php5dll - Win32 Release"
+# Name "php5dll - Win32 Release_inline"
# Begin Group "Core"
# PROP Default_Filter ""
@@ -518,13 +518,13 @@ SOURCE=..\ext\odbc\php_odbc.c
SOURCE=..\ext\pcre\php_pcre.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -774,13 +774,13 @@ SOURCE=..\regex\regfree.c
SOURCE=..\ext\pcre\pcrelib\chartables.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -789,13 +789,13 @@ SOURCE=..\ext\pcre\pcrelib\chartables.c
SOURCE=..\ext\pcre\pcrelib\get.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -804,13 +804,13 @@ SOURCE=..\ext\pcre\pcrelib\get.c
SOURCE=..\ext\pcre\pcrelib\maketables.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -819,13 +819,13 @@ SOURCE=..\ext\pcre\pcrelib\maketables.c
SOURCE=..\ext\pcre\pcrelib\pcre.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -834,13 +834,13 @@ SOURCE=..\ext\pcre\pcrelib\pcre.c
SOURCE=..\ext\pcre\pcrelib\study.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# ADD CPP /D "STATIC"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
!ENDIF
@@ -990,17 +990,17 @@ SOURCE=..\ext\calendar\sdncal.h
SOURCE=..\ext\bcmath\libbcmath\src\add.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1012,17 +1012,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
SOURCE=..\ext\bcmath\libbcmath\src\compare.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1034,17 +1034,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
SOURCE=..\ext\bcmath\libbcmath\src\debug.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1056,17 +1056,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
SOURCE=..\ext\bcmath\libbcmath\src\div.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1078,17 +1078,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1100,17 +1100,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1122,17 +1122,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
SOURCE=..\ext\bcmath\libbcmath\src\init.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1144,17 +1144,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1166,17 +1166,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1188,17 +1188,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
SOURCE=..\ext\bcmath\libbcmath\src\neg.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1210,17 +1210,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1232,17 +1232,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1254,17 +1254,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1276,17 +1276,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
SOURCE=..\ext\bcmath\libbcmath\src\output.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1298,17 +1298,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
SOURCE=..\ext\bcmath\libbcmath\src\raise.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1320,17 +1320,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1342,17 +1342,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1364,17 +1364,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1386,17 +1386,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
SOURCE=..\ext\bcmath\libbcmath\src\rt.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1408,17 +1408,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1430,17 +1430,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1452,17 +1452,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
SOURCE=..\ext\bcmath\libbcmath\src\sub.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1474,17 +1474,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
SOURCE=..\ext\bcmath\libbcmath\src\zero.c
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
@@ -1500,11 +1500,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
@@ -1515,11 +1515,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
SOURCE=..\ext\bcmath\libbcmath\src\config.h
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
@@ -1530,11 +1530,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
SOURCE=..\ext\bcmath\libbcmath\src\private.h
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# PROP Intermediate_Dir "..\Release_inline_bcmath"
@@ -1675,7 +1675,7 @@ SOURCE=..\win32\wfile.h
SOURCE=..\ext\standard\parsedate.y
-!IF "$(CFG)" == "php4dll - Win32 Debug"
+!IF "$(CFG)" == "php5dll - Win32 Debug"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -1686,7 +1686,7 @@ InputPath=..\ext\standard\parsedate.y
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -1697,7 +1697,7 @@ InputPath=..\ext\standard\parsedate.y
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dll - Win32 Release_inline"
+!ELSEIF "$(CFG)" == "php5dll - Win32 Release_inline"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
diff --git a/win32/php4dllts.dsp b/win32/php5dllts.dsp
index 48b9abd..68d66a7 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5dllts" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=php4dllts - Win32 Debug_TS
+CFG=php5dllts - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4dllts.mak".
+!MESSAGE NMAKE /f "php5dllts.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5dllts.mak" CFG="php5dllts - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "php5dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -31,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -44,8 +44,8 @@ RSC=rc.exe
# PROP Intermediate_Dir "Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "_DEBUG"
@@ -55,9 +55,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"msvcrt" /out:"..\Debug_TS\php5ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"Debug_TS" /libpath:"..\..\zlib\Debug" /libpath:"..\..\libxml\lib\Debug" /libpath:"..\ext\sqlite\Debug_TS" /libpath:"..\..\libiconv\lib"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -70,8 +70,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_STATIC" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -81,14 +81,14 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\ext\sqlite\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS\php5ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"Release_TS" /libpath:"..\ext\sqlite\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dllts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5dllts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -97,8 +97,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TS_inline"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib" /libpath:"..\ext\sqlite\Release_TS"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php5ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TS_inline\php5ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"Release_TS_Inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib" /libpath:"..\ext\sqlite\Release_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4dllts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4dllts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5dllts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TSDbg"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -124,8 +124,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release_TSDbg"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\..\zlib" /I "..\Zend" /I "..\TSRM" /I "..\..\libxml\include" /I "..\ext\sqlite\libsqlite\src" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP5DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "LIBXML_THREAD_ENABLED" /D "LIBXML_STATIC" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x40d /d "NDEBUG"
@@ -134,17 +134,17 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\ext\sqlite\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php5ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"Release_TS"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib ws2_32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib zlib.lib libxml2_a.lib Urlmon.lib libsqlite.lib iconv_a.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /out:"..\Release_TSDbg\php5ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"Release_TSDbg" /libpath:"..\ext\sqlite\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\..\zlib\Release" /libpath:"..\..\libxml\lib\Release" /libpath:"..\..\libiconv\lib"
!ENDIF
# Begin Target
-# Name "php4dllts - Win32 Debug_TS"
-# Name "php4dllts - Win32 Release_TS"
-# Name "php4dllts - Win32 Release_TS_inline"
-# Name "php4dllts - Win32 Release_TSDbg"
+# Name "php5dllts - Win32 Debug_TS"
+# Name "php5dllts - Win32 Release_TS"
+# Name "php5dllts - Win32 Release_TS_inline"
+# Name "php5dllts - Win32 Release_TSDbg"
# Begin Group "Core"
# PROP Default_Filter ""
@@ -767,22 +767,22 @@ SOURCE=..\ext\calendar\sdncal.h
SOURCE=..\ext\bcmath\libbcmath\src\add.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -796,22 +796,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
SOURCE=..\ext\bcmath\libbcmath\src\compare.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -825,22 +825,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
SOURCE=..\ext\bcmath\libbcmath\src\debug.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -854,22 +854,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
SOURCE=..\ext\bcmath\libbcmath\src\div.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -883,22 +883,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -912,22 +912,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -941,22 +941,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
SOURCE=..\ext\bcmath\libbcmath\src\init.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -970,22 +970,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -999,22 +999,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1028,22 +1028,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
SOURCE=..\ext\bcmath\libbcmath\src\neg.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1057,22 +1057,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1086,22 +1086,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1115,22 +1115,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1144,22 +1144,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
SOURCE=..\ext\bcmath\libbcmath\src\output.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1173,22 +1173,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
SOURCE=..\ext\bcmath\libbcmath\src\raise.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1202,22 +1202,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1231,22 +1231,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1260,22 +1260,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1289,22 +1289,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
SOURCE=..\ext\bcmath\libbcmath\src\rt.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1318,22 +1318,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1347,22 +1347,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1376,22 +1376,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
SOURCE=..\ext\bcmath\libbcmath\src\sub.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1405,22 +1405,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
SOURCE=..\ext\bcmath\libbcmath\src\zero.c
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
# ADD CPP /I "..\ext\bcmath\libbcmath\src"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1438,19 +1438,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1462,19 +1462,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
SOURCE=..\ext\bcmath\libbcmath\src\config.h
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -1486,19 +1486,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
SOURCE=..\ext\bcmath\libbcmath\src\private.h
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
# PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"
@@ -2151,7 +2151,7 @@ SOURCE=.\winutil.h
SOURCE=..\ext\standard\parsedate.y
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -2162,7 +2162,7 @@ InputPath=..\ext\standard\parsedate.y
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -2173,7 +2173,7 @@ InputPath=..\ext\standard\parsedate.y
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -2184,7 +2184,7 @@ InputPath=..\ext\standard\parsedate.y
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
# Begin Custom Build - Generating ext/standard/parsedate.c
InputPath=..\ext\standard\parsedate.y
@@ -2373,17 +2373,17 @@ SOURCE=..\ext\com_dotnet\com_variant.c
# End Group
# Begin Source File
-SOURCE=.\php4dllts.rc
+SOURCE=.\php5dllts.rc
# End Source File
# Begin Source File
-SOURCE=.\php4dllts.rc2
+SOURCE=.\php5dllts.rc2
# End Source File
# Begin Source File
SOURCE=.\phpts.def
-!IF "$(CFG)" == "php4dllts - Win32 Debug_TS"
+!IF "$(CFG)" == "php5dllts - Win32 Debug_TS"
USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"
# Begin Custom Build - Generating $(InputPath)
@@ -2394,7 +2394,7 @@ InputPath=.\phpts.def
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS"
USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"
# Begin Custom Build - Generating $(InputPath)
@@ -2405,7 +2405,7 @@ InputPath=.\phpts.def
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TS_inline"
USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"
# Begin Custom Build - Generating $(InputPath)
@@ -2416,7 +2416,7 @@ InputPath=.\phpts.def
# End Custom Build
-!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5dllts - Win32 Release_TSDbg"
USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"
# Begin Custom Build - Generating $(InputPath)
diff --git a/win32/php4dllts.rc b/win32/php5dllts.rc
index fc46520..2e01037 100644
--- a/win32/php4dllts.rc
+++ b/win32/php5dllts.rc
@@ -70,7 +70,7 @@ END
BEGIN
- "#include ""php4dllts.rc2""\r\n"
+ "#include ""php5dllts.rc2""\r\n"
"\0"
@@ -114,7 +114,7 @@ END
//
-#include "php4dllts.rc2"
+#include "php5dllts.rc2"
diff --git a/win32/php4dllts.rc2 b/win32/php5dllts.rc2
index e5680f4..7ae69e4 100644
--- a/win32/php4dllts.rc2
+++ b/win32/php5dllts.rc2
@@ -1,5 +1,5 @@
//
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
//
#ifdef APSTUDIO_INVOKED
@@ -42,7 +42,7 @@ BEGIN
VALUE "InternalName", "php\0"
VALUE "LegalCopyright", "Copyright © 1997-2004 The PHP Group\0"
VALUE "LegalTrademarks", "php\0"
- VALUE "OriginalFilename", "php4ts.dll\0"
+ VALUE "OriginalFilename", "php5ts.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "PHP Thread Safe\0"
VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION)
diff --git a/win32/php4ts.dsp b/win32/php5ts.dsp
index c69a20c..3922904 100644
--- a/win32/php4ts.dsp
+++ b/win32/php5ts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4ts" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5ts" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=php4ts - Win32 Debug_TS
+CFG=php5ts - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4ts.mak".
+!MESSAGE NMAKE /f "php5ts.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4ts.mak" CFG="php4ts - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5ts.mak" CFG="php5ts - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CFG=php4ts - Win32 Debug_TS
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4ts - Win32 Release_TS"
+!IF "$(CFG)" == "php5ts - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -53,9 +53,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
-!ELSEIF "$(CFG)" == "php4ts - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5ts - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS/php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
+# ADD LINK32 winmm.lib netapi32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS/php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "php4ts - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5ts - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -105,15 +105,15 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\php.exe" /libpath:"..\Release_TS_inline"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib ws2_32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\php.exe" /libpath:"..\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4ts - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5ts - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -132,17 +132,17 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
!ENDIF
# Begin Target
-# Name "php4ts - Win32 Release_TS"
-# Name "php4ts - Win32 Debug_TS"
-# Name "php4ts - Win32 Release_TS_inline"
-# Name "php4ts - Win32 Release_TSDbg"
+# Name "php5ts - Win32 Release_TS"
+# Name "php5ts - Win32 Debug_TS"
+# Name "php5ts - Win32 Release_TS_inline"
+# Name "php5ts - Win32 Release_TSDbg"
# Begin Group "Source Files"
# PROP Default_Filter ".c"
@@ -177,11 +177,11 @@ SOURCE=..\sapi\cgi\libfcgi\os_win32.c
# End Group
# Begin Source File
-SOURCE=.\php4ts.rc
+SOURCE=.\php5ts.rc
# End Source File
# Begin Source File
-SOURCE=.\php4ts.rc2
+SOURCE=.\php5ts.rc2
# End Source File
# End Target
# End Project
diff --git a/win32/php5ts.dsw b/win32/php5ts.dsw
index 0e72c34..029923a 100644
--- a/win32/php5ts.dsw
+++ b/win32/php5ts.dsw
@@ -57,7 +57,7 @@ Package=<4>
###############################################################################
-Project: "php4activescript"=..\SAPI\activescript\php4activescript.dsp - Package Owner=<4>
+Project: "php5activescript"=..\SAPI\activescript\php5activescript.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -66,13 +66,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=<4>
+Project: "php5aolserver"=..\sapi\aolserver\php5aolserver.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -81,13 +81,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=<4>
+Project: "php5apache"=..\sapi\apache\php5apache.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -96,13 +96,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4apache2"=..\SAPI\APACHE2HANDLER\php4apache2.dsp - Package Owner=<4>
+Project: "php5apache2"=..\SAPI\APACHE2HANDLER\php5apache2.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -111,13 +111,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4dllts"=.\php4dllts.dsp - Package Owner=<4>
+Project: "php5dllts"=.\php5dllts.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -138,7 +138,7 @@ Package=<4>
###############################################################################
-Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=<4>
+Project: "php5isapi"=..\sapi\isapi\php5isapi.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -147,13 +147,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=<4>
+Project: "php5nsapi"=..\sapi\nsapi\php5nsapi.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -162,13 +162,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4pi3web"=..\sapi\pi3web\php4pi3web.dsp - Package Owner=<4>
+Project: "php5pi3web"=..\sapi\pi3web\php5pi3web.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -177,13 +177,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4ts"=.\php4ts.dsp - Package Owner=<4>
+Project: "php5ts"=.\php5ts.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -192,13 +192,13 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
###############################################################################
-Project: "php4ts_cli"=.\php4ts_cli.dsp - Package Owner=<4>
+Project: "php5ts_cli"=.\php5ts_cli.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +207,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4dllts
+ Project_Dep_Name php5dllts
End Project Dependency
}}}
@@ -222,7 +222,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name php4ts
+ Project_Dep_Name php5ts
End Project Dependency
}}}
diff --git a/win32/php4ts.rc b/win32/php5ts.rc
index eee4ef4..d9a4aa5 100644
--- a/win32/php4ts.rc
+++ b/win32/php5ts.rc
@@ -70,7 +70,7 @@ END
BEGIN
- "#include ""php4ts.rc2""\r\n"
+ "#include ""php5ts.rc2""\r\n"
"\0"
@@ -114,7 +114,7 @@ END
//
-#include "php4ts.rc2"
+#include "php5ts.rc2"
diff --git a/win32/php4ts.rc2 b/win32/php5ts.rc2
index 571d855..a708ac5 100644
--- a/win32/php4ts.rc2
+++ b/win32/php5ts.rc2
@@ -1,5 +1,5 @@
//
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
//
#ifdef APSTUDIO_INVOKED
diff --git a/win32/php4ts_cli.dsp b/win32/php5ts_cli.dsp
index 9c086fa..37a4113 100644
--- a/win32/php4ts_cli.dsp
+++ b/win32/php5ts_cli.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php4ts_cli" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="php5ts_cli" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=php4ts_cli - Win32 Debug_TS
+CFG=php5ts_cli - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "php4ts_cli.mak".
+!MESSAGE NMAKE /f "php5ts_cli.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "php4ts_cli.mak" CFG="php4ts_cli - Win32 Debug_TS"
+!MESSAGE NMAKE /f "php5ts_cli.mak" CFG="php5ts_cli - Win32 Debug_TS"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "php4ts_cli - Win32 Release_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
-!MESSAGE "php4ts_cli - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Debug_TS" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")
+!MESSAGE "php5ts_cli - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -30,7 +30,7 @@ CFG=php4ts_cli - Win32 Debug_TS
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "php4ts_cli - Win32 Release_TS"
+!IF "$(CFG)" == "php5ts_cli - Win32 Release_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -53,9 +53,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\cli\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\cli\php.exe" /libpath:"..\Release_TS"
-!ELSEIF "$(CFG)" == "php4ts_cli - Win32 Debug_TS"
+!ELSEIF "$(CFG)" == "php5ts_cli - Win32 Debug_TS"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -78,15 +78,15 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\cli\php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
+# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\cli\php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
# SUBTRACT LINK32 /pdb:none
-!ELSEIF "$(CFG)" == "php4ts_cli - Win32 Release_TS_inline"
+!ELSEIF "$(CFG)" == "php5ts_cli - Win32 Release_TS_inline"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TS_inline"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -105,15 +105,15 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\cli\php.exe" /libpath:"..\Release_TS_inline"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\cli\php.exe" /libpath:"..\Release_TS_inline"
-!ELSEIF "$(CFG)" == "php4ts_cli - Win32 Release_TSDbg"
+!ELSEIF "$(CFG)" == "php5ts_cli - Win32 Release_TSDbg"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "php4ts___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "php4ts___Win32_Release_TSDbg"
+# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"
+# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
@@ -132,17 +132,17 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
+# ADD BASE LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php5ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TSDbg\php.exe" /libpath:"..\Release_TSDbg"
!ENDIF
# Begin Target
-# Name "php4ts_cli - Win32 Release_TS"
-# Name "php4ts_cli - Win32 Debug_TS"
-# Name "php4ts_cli - Win32 Release_TS_inline"
-# Name "php4ts_cli - Win32 Release_TSDbg"
+# Name "php5ts_cli - Win32 Release_TS"
+# Name "php5ts_cli - Win32 Debug_TS"
+# Name "php5ts_cli - Win32 Release_TS_inline"
+# Name "php5ts_cli - Win32 Release_TSDbg"
# Begin Group "Source Files"
# PROP Default_Filter ".c"
@@ -165,11 +165,11 @@ SOURCE=..\sapi\cli\php_getopt.h
# End Group
# Begin Source File
-SOURCE=.\php4ts_cli.rc
+SOURCE=.\php5ts_cli.rc
# End Source File
# Begin Source File
-SOURCE=.\php4ts_cli.rc2
+SOURCE=.\php5ts_cli.rc2
# End Source File
# End Target
# End Project
diff --git a/win32/php4ts_cli.rc b/win32/php5ts_cli.rc
index cc9af4f..0053e0c 100644
--- a/win32/php4ts_cli.rc
+++ b/win32/php5ts_cli.rc
@@ -70,7 +70,7 @@ END
BEGIN
- "#include ""php4ts_cli.rc2""\r\n"
+ "#include ""php5ts_cli.rc2""\r\n"
"\0"
@@ -114,7 +114,7 @@ END
//
-#include "php4ts_cli.rc2"
+#include "php5ts_cli.rc2"
diff --git a/win32/php4ts_cli.rc2 b/win32/php5ts_cli.rc2
index d9ec863..21517ca 100644
--- a/win32/php4ts_cli.rc2
+++ b/win32/php5ts_cli.rc2
@@ -1,5 +1,5 @@
//
-// php4dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
//
#ifdef APSTUDIO_INVOKED
diff --git a/win32/pws-php4cgi.reg b/win32/pws-php5cgi.reg
index 46edc77..46edc77 100644
--- a/win32/pws-php4cgi.reg
+++ b/win32/pws-php5cgi.reg
diff --git a/win32/pws-php4isapi.reg b/win32/pws-php5isapi.reg
index 47804a9..393604d 100644
--- a/win32/pws-php4isapi.reg
+++ b/win32/pws-php5isapi.reg
@@ -1,5 +1,5 @@
REGEDIT4
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script Map]
-".php"="[PUT PATH HERE]\\php4isapi.dll"
+".php"="[PUT PATH HERE]\\php5isapi.dll"
diff --git a/win32/resource.h b/win32/resource.h
index 5a1669b..3e7e4c0 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
-// Used by php4dllts.rc
+// Used by php5dllts.rc
//
// Next default values for new objects
diff --git a/win32/signal.h b/win32/signal.h
index a95b15c..de43f98 100644
--- a/win32/signal.h
+++ b/win32/signal.h
@@ -3,7 +3,7 @@
** the original "#include <signal.h>" produces an infinite reinclusion
** of this file, instead of including the standard include-file.
** Under MS Visual Studio, there are occurences in the source where
-** <signal.h> gets included throughout the PHP4 sources, and this should
+** <signal.h> gets included throughout the PHP sources, and this should
** include THIS file, not the standard one which does not have the
** additional signals defined below.
** One way to remove the infinite reinclusion of this file (which is located