Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  fixed copying of the struct as it's not being modified
  avoid strlen usage in loop
  Removes accidentally added files.
  Reverts some unwanted changes
  Deletes patch leftovers
  Replaces php5 with php7, without whitespace changes.

156 files changed, 1049 insertions, 1063 deletions

diff --git a/.gitignore b/.gitignore
index e0943f115c..be17e24455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,7 +82,7 @@ mkinstalldirs
 modules
 php
 php-*.tar.gz
-php5.spec
+php7.spec
 php_lcov.info
 php_test_results_*.txt
 php_version.h
@@ -260,9 +260,9 @@ pear/phpize
 pear/run-tests
 pear/php-config
 pear/scripts
-sapi/apache/libphp5.module
-sapi/apache2handler/libphp5.module
-sapi/apache_hooks/libphp5.module
+sapi/apache/libphp7.module
+sapi/apache2handler/libphp7.module
+sapi/apache_hooks/libphp7.module
 sapi/cgi/php-cgi
 sapi/cgi/php-cgi.1
 sapi/cli/php.1
diff --git a/INSTALL b/INSTALL
index 141e4f8312..3071f267ae 100644
--- a/INSTALL
+++ b/INSTALL
@@ -223,12 +223,12 @@ Apache 1.3.x on Unix systems
     module on your system.  The make install from above may have already
     added this for you, but be sure to check.
 
-      LoadModule php5_module libexec/libphp5.so
+      LoadModule php7_module libexec/libphp7.so
 
 15. And in the AddModule section of httpd.conf, somewhere under the
     ClearModuleList, add this:
 
-      AddModule mod_php5.c
+      AddModule mod_php7.c
 
 16. Tell Apache to parse certain extensions as PHP.  For example,
     let's have Apache parse the .php extension as PHP.  You could
@@ -263,8 +263,8 @@ Apache 1.3.x on Unix systems
 
 10. cd ../apache_1.3.x
 
-11. ./configure --prefix=/www --activate-module=src/modules/php5/libphp5.a
-    (The above line is correct! Yes, we know libphp5.a does not exist at this
+11. ./configure --prefix=/www --activate-module=src/modules/php7/libphp7.a
+    (The above line is correct! Yes, we know libphp7.a does not exist at this
     stage. It isn't supposed to. It will be created.)
 
 12. make
@@ -309,24 +309,24 @@ stop and start:
    Different examples of compiling PHP for apache are as follows:
 ./configure --with-apxs --with-pgsql
 
-   This will create a libphp5.so shared library that is loaded into Apache
+   This will create a libphp7.so shared library that is loaded into Apache
    using  a  LoadModule  line  in Apache's httpd.conf file. The PostgreSQL
    support is embedded into this library.
 
 ./configure --with-apxs --with-pgsql=shared
 
-   This  will  create  a libphp5.so shared library for Apache, but it will
+   This  will  create  a libphp7.so shared library for Apache, but it will
    also create a pgsql.so shared library that is loaded into PHP either by
    using  the  extension  directive  in  php.ini  file  or  by  loading it
    explicitly in a script using the dl() function.
 
 ./configure --with-apache=/path/to/apache_source --with-pgsql
 
-   This  will  create  a  libmodphp5.a  library,  a  mod_php5.c  and  some
-   accompanying files and copy this into the src/modules/php5 directory in
+   This  will  create  a  libmodphp7.a  library,  a  mod_php7.c  and  some
+   accompanying files and copy this into the src/modules/php7 directory in
    the    Apache    source   tree.   Then   you   compile   Apache   using
-   --activate-module=src/modules/php5/libphp5.a   and   the  Apache  build
-   system  will  create  libphp5.a  and  link it statically into the httpd
+   --activate-module=src/modules/php7/libphp7.a   and   the  Apache  build
+   system  will  create  libphp7.a  and  link it statically into the httpd
    binary.  The  PostgreSQL  support  is included directly into this httpd
    binary, so the final result here is a single httpd binary that includes
    all of Apache and all of PHP.
@@ -450,7 +450,7 @@ cp php.ini-development /usr/local/lib/php.ini
        hand side of the LoadModule statement must point to the path of the
        PHP  module  on  your  system. The make install from above may have
        already added this for you, but be sure to check.
-LoadModule php5_module modules/libphp5.so
+LoadModule php7_module modules/libphp7.so
     8. Tell  Apache to parse certain extensions as PHP. For example, let's
        have  Apache  parse  .php  files  as PHP. Instead of only using the
        Apache  AddType  directive,  we want to avoid potentially dangerous
@@ -461,7 +461,7 @@ LoadModule php5_module modules/libphp5.so
 <FilesMatch \.php$>
     SetHandler application/x-httpd-php
 </FilesMatch>
-       Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php6,
+       Or,  if we wanted to allow .php, .php2, .php3, .php4, .php5, .php7,
        and  .phtml files to be executed as PHP, but nothing else, we'd use
        this:
 <FilesMatch "\.ph(p[2-6]?|tml)$">
@@ -1004,16 +1004,16 @@ Debian GNU/Linux installation notes
 Using APT
 
    First,   note   that   other  related  packages  may  be  desired  like
-   libapache2-mod-php5 to integrate with Apache 2, and php-pear for PEAR.
+   libapache2-mod-php7 to integrate with Apache 2, and php-pear for PEAR.
 
    Second,  before  installing  a package, it's wise to ensure the package
    list  is  up  to  date.  Typically, this is done by running the command
    apt-get update.
 
    Example #1 Debian Install Example with Apache 2
-# apt-get install php5-common libapache2-mod-php5 php5-cli
+# apt-get install php7-common libapache2-mod-php7 php7-cli
 
-   APT will automatically install the PHP 5 module for Apache 2 and all of
+   APT will automatically install the PHP 7 module for Apache 2 and all of
    its  dependencies,  and then activate it. Apache should be restarted in
    order for the changes take place. For example:
 
@@ -1027,23 +1027,23 @@ Better control of configuration
    very  likely  that  additional  modules will be desired, such as MySQL,
    cURL, GD, etc. These may also be installed via the apt-get command.
 
-   Example #3 Methods for listing additional PHP 5 packages
-# apt-cache search php5
-# aptitude search php5
-# aptitude search php5 |grep -i mysql
+   Example #3 Methods for listing additional PHP 7 packages
+# apt-cache search php7
+# aptitude search php7
+# aptitude search php7 |grep -i mysql
 
    The examples will show a lot of packages including several PHP specific
-   ones  like  php5-cgi, php5-cli and php5-dev. Determine which are needed
+   ones  like  php7-cgi, php7-cli and php7-dev. Determine which are needed
    and  install  them  like any other with either apt-get or aptitude. And
    because  Debian  performs  dependency checks, it'll prompt for those so
    for example to install MySQL and cURL:
 
    Example #4 Install PHP with MySQL, cURL
-# apt-get install php5-mysql php5-curl
+# apt-get install php7-mysql php7-curl
 
    APT  will  automatically  add  the  appropriate  lines to the different
-   php.ini      related      files     like     /etc/php5/apache2/php.ini,
-   /etc/php5/conf.d/pdo.ini,  etc. and depending on the extension will add
+   php.ini      related      files     like     /etc/php7/apache2/php.ini,
+   /etc/php7/conf.d/pdo.ini,  etc. and depending on the extension will add
    entries similar to extension=foo.so. However, restarting the web server
    (like Apache) is required before these changes take affect.
 
@@ -1137,9 +1137,9 @@ Using the bundled PHP
     2. With  a  text  editor, uncomment the lines (by removing the #) that
        look  similar  to  the  following  (these  two  lines are often not
        together, locate them both in the file):
-# LoadModule php5_module libexec/httpd/libphp5.so
+# LoadModule php7_module libexec/httpd/libphp7.so
 
-# AddModule mod_php5.c
+# AddModule mod_php7.c
 
        Notice  the  location/path.  When  building  PHP in the future, the
        above files should be replaced or commented out.
@@ -1148,7 +1148,7 @@ Using the bundled PHP
        Due  to  the following statement already existing in httpd.conf (as
        of   Mac  Panther),  once  PHP  is  enabled  the  .php  files  will
        automatically parse as PHP.
-<IfModule mod_php5.c>
+<IfModule mod_php7.c>
     # If php is turned on, we respect .php and .phps files.
     AddType application/x-httpd-php .php
     AddType application/x-httpd-php-source .phps
@@ -1740,7 +1740,7 @@ Running PHP as an Apache module
           php_admin_flag can not be overridden by .htaccess or ini_set().
 
    Example #1 Apache configuration example
-<IfModule mod_php5.c>
+<IfModule mod_php7.c>
   php_value include_path ".:/usr/local/lib/php"
   php_admin_flag engine on
 </IfModule>
@@ -1810,7 +1810,7 @@ Installation
        script file via my browser, I get a server 500 error.
     8. Some  operating  systems:  I have installed PHP without errors, but
        when  I  try  to  start  Apache  I  get  undefined  symbol  errors:
-       [mybox:user   /src/php5]   root#  apachectl  configtest  apachectl:
+       [mybox:user   /src/php7]   root#  apachectl  configtest  apachectl:
        /usr/local/apache/bin/httpd     Undefined     symbols:    _compress
        _uncompress
     9. Windows:  I  have  installed  PHP,  but  when I try to access a PHP
@@ -1912,7 +1912,7 @@ AddModule mod_perl.c
 
 # Extra Modules
 LoadModule php_module         modules/mod_php.so
-LoadModule php5_module        modules/libphp5.so
+LoadModule php7_module        modules/libphp7.so
 LoadModule perl_module        modules/libperl.so
 
           And add:
@@ -1954,7 +1954,7 @@ AddType application/x-httpd-php .php
    Some operating systems: I have installed PHP without errors, but when I
           try to start Apache I get undefined symbol errors:
 
-[mybox:user /src/php5] root# apachectl configtest
+[mybox:user /src/php7] root# apachectl configtest
  apachectl: /usr/local/apache/bin/httpd Undefined symbols:
   _compress
   _uncompress
@@ -1984,7 +1984,7 @@ cgi error:
           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, php5ts.dll,
+          + File  permissions  on  your  PHP  script, php.exe, php7ts.dll,
             php.ini  or any PHP extensions you are trying to load are such
             that  the  anonymous  internet  user ISUR_<machinename> cannot
             access them.
@@ -2103,7 +2103,7 @@ cgi error:
           to  choose  PHP  files from URL with no extension. In this case,
           replace the line AddType application/x-httpd-php .php with:
 
-AddHandler php5-script php
+AddHandler php7-script php
 AddType text/html php
 
           This  solution  doesn't  work for Apache 1 as PHP module doesn't
diff --git a/Makefile.global b/Makefile.global
index bd82daf4d8..f833efa5e7 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -119,7 +119,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
-	rm -f php5.spec main/build-defs.h scripts/phpize
+	rm -f php7.spec main/build-defs.h scripts/phpize
 	rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API
index ab6250259a..46e190efc1 100644
--- a/README.PARAMETER_PARSING_API
+++ b/README.PARAMETER_PARSING_API
@@ -221,4 +221,3 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &n
 for (i = 0; i < num_varargs; i++) {
     /* do something with varargs[i] */
 }
-
diff --git a/README.TESTING b/README.TESTING
index 3ed5e6b2ab..1972f5f6f3 100644
--- a/README.TESTING
+++ b/README.TESTING
@@ -118,7 +118,7 @@ Example script to be run by cron(1):
 ========== qa-test.sh =============
 #!/bin/sh
 
-CO_DIR=$HOME/cvs/php5
+CO_DIR=$HOME/cvs/php7
 MYMAIL=qa-test@domain.com
 TMPDIR=/var/tmp
 TODAY=`date +"%Y%m%d"`
diff --git a/README.UNIX-BUILD-SYSTEM b/README.UNIX-BUILD-SYSTEM
index 9b49cb8bc8..54dcae3fc6 100644
--- a/README.UNIX-BUILD-SYSTEM
+++ b/README.UNIX-BUILD-SYSTEM
@@ -108,7 +108,7 @@ module, program, etc).
 
 For example for APXS:
 
-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php5.c php_apache.c)
+PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
 
 
 
diff --git a/README.input_filter b/README.input_filter
index e2941d029e..78e2edd2ec 100644
--- a/README.input_filter
+++ b/README.input_filter
@@ -181,4 +181,3 @@ PHP_FUNCTION(my_get_raw)
         RETVAL_FALSE;
     }
 }
-
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 8941ab924a..75d9dd1ab6 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -205,15 +205,15 @@ typedef struct {
 
 #define SECS_BETWEEN_EPOCHS (__int64)11644473600
 #define SECS_TO_100NS (__int64)10000000
-static inline time_t FileTimeToUnixTime(const FILETIME FileTime)
+static inline time_t FileTimeToUnixTime(const FILETIME *FileTime)
 {
 	__int64 UnixTime;
 	long *nsec = NULL;
 	SYSTEMTIME SystemTime;
-	FileTimeToSystemTime(&FileTime, &SystemTime);
+	FileTimeToSystemTime(FileTime, &SystemTime);
 
-	UnixTime = ((__int64)FileTime.dwHighDateTime << 32) +
-	FileTime.dwLowDateTime;
+	UnixTime = ((__int64)FileTime->dwHighDateTime << 32) +
+	FileTime->dwLowDateTime;
 
 	UnixTime -= (SECS_BETWEEN_EPOCHS * SECS_TO_100NS);
 
@@ -397,9 +397,9 @@ CWD_API int php_sys_stat_ex(const char *path, zend_stat_t *buf, int lstat) /* {{
 	t = t << 32;
 	t |= data.nFileSizeLow;
 	buf->st_size = t;
-	buf->st_atime = FileTimeToUnixTime(data.ftLastAccessTime);
-	buf->st_ctime = FileTimeToUnixTime(data.ftCreationTime);
-	buf->st_mtime = FileTimeToUnixTime(data.ftLastWriteTime);
+	buf->st_atime = FileTimeToUnixTime(&data.ftLastAccessTime);
+	buf->st_ctime = FileTimeToUnixTime(&data.ftCreationTime);
+	buf->st_mtime = FileTimeToUnixTime(&data.ftLastWriteTime);
 	return 0;
 }
 /* }}} */
diff --git a/acinclude.m4 b/acinclude.m4
index ef1063c07f..c16919f70f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -844,7 +844,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[
       ;;
     *netware*[)]
       suffix=nlm
-      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware -lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
+      link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php7lib, , -L$(top_builddir)/netware -lphp7lib) $(translit(ifelse($1, php7lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
       ;;
     *[)]
       suffix=la
diff --git a/build/build.mk b/build/build.mk
index 3a48148e7e..007f081f19 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -39,7 +39,7 @@ $(STAMP): build/buildcheck.sh
 snapshot:
 	distname='$(DISTNAME)'; \
 	if test -z "$$distname"; then \
-		distname='php5-snapshot'; \
+		distname='php7-snapshot'; \
 	fi; \
 	myname=`basename \`pwd\`` ; \
 	cd .. && cp -rp $$myname $$distname; \
diff --git a/configure.in b/configure.in
index 2f7f837811..bcdd55a51c 100644
--- a/configure.in
+++ b/configure.in
@@ -335,10 +335,10 @@ case $host_alias in
     PHP_BUILD_PROGRAM
     PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
     PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
-    PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
+    PHP7LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
     EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext
-    PHP_SUBST(PHP5LIB_SHARED_LIBADD)
-    PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware)
+    PHP_SUBST(PHP7LIB_SHARED_LIBADD)
+    PHP_SHARED_MODULE(php7lib, PHP_GLOBAL_OBJS, netware)
     ;;
 esac
 
@@ -1521,7 +1521,7 @@ $php_shtool mkdir -p pear/scripts
 $php_shtool mkdir -p scripts
 $php_shtool mkdir -p scripts/man1
 
-ALL_OUTPUT_FILES="php5.spec main/build-defs.h \
+ALL_OUTPUT_FILES="php7.spec main/build-defs.h \
 scripts/phpize scripts/man1/phpize.1 \
 scripts/php-config scripts/man1/php-config.1 \
 $PHP_OUTPUT_FILES"
diff --git a/ext/bz2/bz2.dsp b/ext/bz2/bz2.dsp
index a054c522a7..a858879396 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 php5ts.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 php7ts.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 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"

+# ADD LINK32 php7ts_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/ctype/ctype.dsp b/ext/ctype/ctype.dsp
index 1305c72f6a..d9bde43178 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 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"

+# ADD LINK32 php7ts.lib kernel32.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 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"

+# ADD LINK32 php7ts_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 6524fceb89..ae3257619c 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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386

+# ADD LINK32 php7ts.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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386

+# ADD LINK32 php7ts_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 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"

+# ADD BASE LINK32 php7ts_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 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"

+# ADD LINK32 php7ts_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 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"

+# ADD BASE LINK32 php7ts.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 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"

+# ADD LINK32 php7ts.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/date/php_date.c b/ext/date/php_date.c
index a93afab59b..3fd4b27eb3 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4496,12 +4496,12 @@ PHP_FUNCTION(timezone_abbreviations_list)
 
 	do {
 		array_init(&element);
-		add_assoc_bool(&element, "dst", entry->type);
-		add_assoc_long(&element, "offset", entry->gmtoffset);
+		add_assoc_bool_ex(&element, "dst", sizeof("dst") -1, entry->type);
+		add_assoc_long_ex(&element, "offset", sizeof("offset") - 1, entry->gmtoffset);
 		if (entry->full_tz_name) {
-			add_assoc_string(&element, "timezone_id", entry->full_tz_name);
+			add_assoc_string_ex(&element, "timezone_id", sizeof("timezone_id") - 1, entry->full_tz_name);
 		} else {
-			add_assoc_null(&element, "timezone_id");
+			add_assoc_null_ex(&element, "timezone_id", sizeof("timezone_id") - 1);
 		}
 
 		abbr_array_p = zend_hash_str_find(HASH_OF(return_value), entry->name, strlen(entry->name));
diff --git a/ext/dba/dba.dsp b/ext/dba/dba.dsp
index ddfd1485a9..548ecf8637 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 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"

+# ADD BASE LINK32 php7ts.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 php7ts.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 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"

+# ADD BASE LINK32 php7ts_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 php7ts_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/dom/dom.dsp b/ext/dom/dom.dsp
index f2ae5b1a76..cc507e5317 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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386

+# ADD LINK32 wsock32.lib php7ts.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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386

+# ADD LINK32 php7ts_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 4a827338b2..c5b26b42d0 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 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"

+# 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 php7ts.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 php7ts.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 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"

+# 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 php7ts.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 php7ts_debug.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_exif.dll" /libpath:"..\..\Debug_TS"

 

 !ENDIF 

 

diff --git a/ext/gd/gd.dsp b/ext/gd/gd.dsp
index d7207562f8..c5ec5aaf7d 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 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"

+# ADD BASE LINK32 php7ts.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 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"

+# ADD LINK32 php7ts.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 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"

+# ADD BASE LINK32 php7ts_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 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"

+# ADD LINK32 php7ts_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 79ea194854..4daddf3ab6 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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_gettext.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"

+# ADD LINK32 php7ts.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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386 /out:"../../Debug_TS/php_gettext.dll" /libpath:"..\..\Debug_TS"

+# ADD LINK32 php7ts_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/iconv/iconv.dsp b/ext/iconv/iconv.dsp
index 2d66cf00ab..f9890f0dcd 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 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"

+# ADD LINK32 php7ts.lib kernel32.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 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"

+# ADD LINK32 php7ts_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 ef05d49f20..c757bf61e9 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 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"

+# 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 php7nts.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 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"

+# 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 php7nts_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 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"

+# 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 php7ts_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 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"

+# 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 php7ts.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/interbase/interbase.dsp b/ext/interbase/interbase.dsp
index c151deb40c..9197dab371 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 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 gds32_ms.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 php7ts_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 php7ts_debug.lib gds32_ms.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 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 gds32_ms.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 php7ts.lib 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 php7ts.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib gds32_ms.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/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c
index 32747ab4ec..4b47fbcfb6 100644
--- a/ext/interbase/php_ibase_udf.c
+++ b/ext/interbase/php_ibase_udf.c
@@ -84,7 +84,7 @@
 *
 *     gcc -shared `php-config --includes` `php-config --ldflags` \
 *         `php-config --libs` -o php_ibase_udf.so php_ibase_udf.c \
-*         /usr/lib/libphp5.a
+*         /usr/lib/libphp7.a
 *
 * If you use the super server, you should also link against the embedded
 * library, but be sure to enable thread safety, as the super server is
@@ -404,4 +404,3 @@ void udf_call_php8(char *name, PARAMDSC *r, PARAMDSC *arg1, PARAMDSC *arg2, PARA
 	PARAMDSC *args[8] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8 };
 	call_php(name, r, 8, args);
 }
-
diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c
index ea9caaa995..4fd7c4597e 100644
--- a/ext/intl/collator/collator_sort.c
+++ b/ext/intl/collator/collator_sort.c
@@ -203,7 +203,7 @@ static int collator_icu_compare_function(zval *result, zval *op1, zval *op2 TSRM
 /* }}} */
 
 /* {{{ collator_compare_func
- * Taken from PHP5 source (array_data_compare).
+ * Taken from PHP7 source (array_data_compare).
  */
 static int collator_compare_func( const void* a, const void* b TSRMLS_DC )
 {
diff --git a/ext/ldap/LDAP_Win32_HOWTO.txt b/ext/ldap/LDAP_Win32_HOWTO.txt
index bcee731e88..30b6096f58 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 '..\..\..\..\php5\regex' to the 'Additional include directories' list.
+    Add '..\..\..\..\php7\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 a97ebe4105..4d37cf3173 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 php5nts.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 php7nts.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 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"

+# ADD LINK32 oldap32.lib olber32.lib php7nts_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 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"

+# ADD BASE LINK32 oldap32.lib olber32.lib php7nts_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 php7ts_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 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"

+# 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 php7ts.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 php7ts.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 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"

+# 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 php7ts.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 php7ts.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 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"

+# ADD BASE LINK32 oldap32.lib olber32.lib php7ts_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 php7ts_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 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"

+# 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 php7ts.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 php7ts.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 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"

+# ADD BASE LINK32 oldap32.lib olber32.lib php7ts_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 php7ts_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 959fe16cf1..f285db0eff 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 5 - LDAP Extension"
+MODULE_DESC = "PHP 7 - LDAP Extension"
 VMAJ = 3
 VMIN = 0
 VREV = 0
diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS
index fc16367ed1..8217e4158f 100644
--- a/ext/mbstring/libmbfl/NEWS
+++ b/ext/mbstring/libmbfl/NEWS
@@ -27,4 +27,3 @@ version 1.1.0 March 02, 2010
 - added cp5022x encoding (moriyoshi)
 - added ISO-2022-JP-MS (moriyoshi)
 - moved to github.com from sourceforge.jp (moriyoshi)
-
diff --git a/ext/mbstring/mbstring.dsp b/ext/mbstring/mbstring.dsp
index 2e050c6d20..c806ff0b78 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 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"

+# ADD BASE LINK32 php7ts.lib kernel32.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 php7ts.lib kernel32.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 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"

+# ADD BASE LINK32 php7ts_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 php7ts_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/mcrypt/mcrypt.dsp b/ext/mcrypt/mcrypt.dsp
index a0a1f00f4c..b335bf7d9e 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 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"

+# 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 php7ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS"

+# ADD LINK32 php7ts.lib 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 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"

+# 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 php7ts.lib ntwdblib.lib /nologo /dll /machine:I386 /out:"MSSQL_65_Release/php_mssql.dll" /libpath:"..\..\Release_TS" /libpath:"mssql-70"

+# ADD LINK32 php7ts_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/mssql/mssql.dsp b/ext/mssql/mssql.dsp
index 43294280dd..58b9ec507e 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 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"

+# 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 php7ts.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 php7ts.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 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 /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_mssql.dll" /pdbtype:sept /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 php7ts_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 php7ts_debug.lib ntwdblib.lib /nologo /dll /incremental:yes /debug /machine:I386 /out:"..\..\Debug_TS/php_mssql.dll" /pdbtype:sept /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 d42bc2555b..735226f88a 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 php5.
+php_build is a directory at the same level as php7.
 
 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 54209be809..1ba77ca8c4 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -489,7 +489,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 5", 5);
+	MS_SQL_G(appname) = estrndup("PHP 7", 5);
 	MS_SQL_G(server_message) = NULL;
 	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 dfc9c63db5..31b015fdaa 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 php5nts.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 php7nts.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 php5nts_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 php7nts_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 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"

+# ADD LINK32 php7ts_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 php5ts.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 php7ts.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 a334202187..96624e60fc 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 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"

+# ADD LINK32 php7ts.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 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"

+# ADD LINK32 php7ts_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/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c
index cd8050c99f..084bc58581 100644
--- a/ext/mysqli/mysqli_warning.c
+++ b/ext/mysqli/mysqli_warning.c
@@ -28,7 +28,7 @@
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
 
-/* Define these in the PHP5 tree to make merging easy process */
+/* Define these in the PHP7 tree to make merging easy process */
 #define Zzend_string_dupLICATE (1<<0)
 #define ZSTR_AUTOFREE  (1<<1)
 
diff --git a/ext/oci8/oci8.dsp b/ext/oci8/oci8.dsp
index f0b27fa824..c889d0cd60 100644
--- a/ext/oci8/oci8.dsp
+++ b/ext/oci8/oci8.dsp
@@ -53,7 +53,7 @@ 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 php5ts.lib /nologo /dll /machine:I386

+# 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 php7ts.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\lib\instantclient" /libpath:"..\..\Release_TS_Inline"

 

 !ELSEIF  "$(CFG)" == "oci8 - Win32 Debug_TS"

@@ -80,7 +80,7 @@ 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 php5ts.lib /nologo /dll /machine:I386

+# 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 php7ts.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\instantclient"

 

 !ENDIF 

diff --git a/ext/openssl/openssl.dsp b/ext/openssl/openssl.dsp
index 857666a6a3..d8cd7ead40 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 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"

+# ADD LINK32 php7ts.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 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"

+# ADD LINK32 php7ts_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/openssl/openssl.mak b/ext/openssl/openssl.mak
index a0c6fa483e..9bc053b662 100644
--- a/ext/openssl/openssl.mak
+++ b/ext/openssl/openssl.mak
@@ -4,7 +4,7 @@ PROJECT_ROOT = ..\..
 
 # Module details
 MODULE_NAME = php_ossl
-MODULE_DESC = "PHP 5 - OpenSSL Extension"
+MODULE_DESC = "PHP 7 - OpenSSL Extension"
 VMAJ = 1
 VMIN = 0
 VREV = 0
diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp
index 098469f36d..eab3d6c0de 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 php5ts.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 php7ts.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 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"

+# 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 php7ts.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 php7ts.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/pspell.dsp b/ext/pspell/pspell.dsp
index f310099d89..87b7683493 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 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"

+# ADD BASE LINK32 php7ts_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 php7ts_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 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"

+# ADD LINK32 php7ts.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/shmop.dsp b/ext/shmop/shmop.dsp
index 848f0bdc91..02afb0a847 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 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"

+# ADD LINK32 php7ts.lib kernel32.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 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"

+# ADD LINK32 php7ts_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 79df918703..5663dc13b0 100644
--- a/ext/simplexml/simplexml.dsp
+++ b/ext/simplexml/simplexml.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 "SIMPLEXML_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\php5" /I "..\..\..\php5\main" /I "..\..\..\php5\Zend" /I "..\..\..\php5\TSRM" /D ZEND_DEBUG=1 /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_SIMPLEXML=1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLEXML_EXPORTS" /D "LIBXML_THREAD_ENABLED" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\php7" /I "..\..\..\php7\main" /I "..\..\..\php7\Zend" /I "..\..\..\php7\TSRM" /D ZEND_DEBUG=1 /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_SIMPLEXML=1 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLEXML_EXPORTS" /D "LIBXML_THREAD_ENABLED" /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"

@@ -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 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"

+# ADD LINK32 php7ts_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:"..\..\..\php7\Debug_TS"

 

 !ELSEIF  "$(CFG)" == "simplexml - Win32 Release_TS"

 

@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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 "SIMPLEXML_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\php5\main" /I "..\..\..\php5\Zend" /I "..\..\..\php5\TSRM" /I "..\..\..\php5\win32" /I "..\..\..\php5" /D ZTS=1 /D ZEND_DEBUG=0 /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_SIMPLEXML=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLEXML_EXPORTS" /D "LIBXML_THREAD_ENABLED" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\php7\main" /I "..\..\..\php7\Zend" /I "..\..\..\php7\TSRM" /I "..\..\..\php7\win32" /I "..\..\..\php7" /D ZTS=1 /D ZEND_DEBUG=0 /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_SIMPLEXML=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SIMPLEXML_EXPORTS" /D "LIBXML_THREAD_ENABLED" /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"

@@ -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 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"

+# ADD LINK32 php7ts.lib kernel32.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:"..\..\..\php7\Release_TS" /libpath:"..\..\..\php7\Release_TS_Inline"

 

 !ENDIF 

 

diff --git a/ext/skeleton/skeleton.dsp b/ext/skeleton/skeleton.dsp
index c3c67c7e34..fdbf245671 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 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"

+# 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 php7ts.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 php7ts.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 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"

+# 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 php7ts.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 php7ts_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 a375577e1b..88f5795650 100644
--- a/ext/skeleton/tests/001.phpt
+++ b/ext/skeleton/tests/001.phpt
@@ -13,7 +13,7 @@ echo "extname extension is available";
   to pass, differences between the output and the
   expected text are interpreted as failure
 
-	see php5/README.TESTING for further information on
+	see php7/README.TESTING for further information on
   writing regression tests
 */
 ?>
diff --git a/ext/snmp/snmp.dsp b/ext/snmp/snmp.dsp
index 3cc62338bd..fa1468beda 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 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"

+# 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 php7ts.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 php7ts.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 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"

+# 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 php7ts.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 php7ts_debug.lib libsnmp.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_snmp.dll" /libpath:"..\..\Debug_TS"

 

 !ENDIF 

 

diff --git a/ext/soap/php_soap.dsp b/ext/soap/php_soap.dsp
index 4157c63320..f07cba636e 100644
--- a/ext/soap/php_soap.dsp
+++ b/ext/soap/php_soap.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 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php5ts.lib libxml2.lib wsock32.lib resolv.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_soap.dll" /libpath:"..\..\\" /libpath:"..\..\..\libxml2-2.4.12\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 php7ts.lib libxml2.lib wsock32.lib resolv.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS\php_soap.dll" /libpath:"..\..\\" /libpath:"..\..\..\libxml2-2.4.12\lib" /libpath:"..\..\Release_TS"

 

 !ELSEIF  "$(CFG)" == "php_soap - 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 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 libxml2.lib wsock32.lib resolv.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_soap.dll" /pdbtype:sept /libpath:"..\..\\" /libpath:"..\..\..\libxml2-2.4.12\lib" /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 php7ts_debug.lib libxml2.lib wsock32.lib resolv.lib /nologo /dll /debug /machine:I386 /out:"..\..\Debug_TS\php_soap.dll" /pdbtype:sept /libpath:"..\..\\" /libpath:"..\..\..\libxml2-2.4.12\lib" /libpath:"..\..\Debug_TS"

 # SUBTRACT LINK32 /pdb:none /incremental:no

 

 !ENDIF 

diff --git a/ext/sockets/sockets.dsp b/ext/sockets/sockets.dsp
index 961bab784d..954f7a5d7e 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 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"

+# ADD LINK32 php7ts.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 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"

+# ADD LINK32 php7ts_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/standard/credits_ext.h b/ext/standard/credits_ext.h
index f77bbdf157..fa1b1325e0 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 php5/scripts/credits from  
- the information found in the various php5/ext/.../CREDITS and
- php5/sapi/.../CREDITS files 
+ it has been automaticaly created by php7/scripts/credits from  
+ the information found in the various php7/ext/.../CREDITS and
+ php7/sapi/.../CREDITS files 
  
  if you want to change an entry you have to edit the appropriate 
  CREDITS file instead
diff --git a/ext/standard/credits_sapi.h b/ext/standard/credits_sapi.h
index 634a370329..8f0b8264ce 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 php5/scripts/credits from  
- the information found in the various php5/ext/.../CREDITS and
- php5/sapi/.../CREDITS files 
+ it has been automaticaly created by php7/scripts/credits from  
+ the information found in the various php7/ext/.../CREDITS and
+ php7/sapi/.../CREDITS files 
  
  if you want to change an entry you have to edit the appropriate 
  CREDITS file instead
diff --git a/ext/standard/tests/file/file_put_contents_variation5.phpt b/ext/standard/tests/file/file_put_contents_variation5.phpt
index 4ecb5213ac..baaa7a65d9 100644
--- a/ext/standard/tests/file/file_put_contents_variation5.phpt
+++ b/ext/standard/tests/file/file_put_contents_variation5.phpt
@@ -48,4 +48,3 @@ File written in working directory
 File written in working directory
 File written in working directory
 ===DONE===
-
diff --git a/ext/sybase_ct/sybase_ct.dsp b/ext/sybase_ct/sybase_ct.dsp
index be2f890bab..ba8f61859c 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 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"

+# 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 php7ts.lib /nologo /dll /machine:I386

+# ADD LINK32 php7ts.lib 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 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"

+# 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 php7ts_debug.lib /nologo /dll /machine:I386

+# ADD LINK32 php7ts_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/examples/cleanhtml.php b/ext/tidy/examples/cleanhtml.php
index 2644210cbf..b47384b810 100644
--- a/ext/tidy/examples/cleanhtml.php
+++ b/ext/tidy/examples/cleanhtml.php
@@ -34,7 +34,3 @@
     echo tidy_get_output();
     
 ?>
-    
-        
-     
-     
\ No newline at end of file
diff --git a/ext/tidy/examples/cleanhtml5.php b/ext/tidy/examples/cleanhtml5.php
index 2ce683acad..c5a1fcd338 100644
--- a/ext/tidy/examples/cleanhtml5.php
+++ b/ext/tidy/examples/cleanhtml5.php
@@ -33,7 +33,3 @@
     echo $tidy;
     
 ?>
-    
-        
-     
-     
diff --git a/ext/tidy/tidy.dsp b/ext/tidy/tidy.dsp
index fe44fa7a51..57147cb756 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 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"

+# ADD LINK32 php7ts.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 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"

+# ADD LINK32 php7ts_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 9844574a8a..25fd5f3dd1 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 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"

+# ADD LINK32 php7ts.lib kernel32.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 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"

+# ADD LINK32 php7ts_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/xml/xml.mak b/ext/xml/xml.mak
index ab60f28eed..b712dea1d6 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 5 - XML Extension"
+MODULE_DESC = "PHP 7 - XML Extension"
 VMAJ = 3
 VMIN = 0
 VREV = 0
diff --git a/ext/xmlreader/README b/ext/xmlreader/README
index 0d946f62da..f85e4a2121 100644
--- a/ext/xmlreader/README
+++ b/ext/xmlreader/README
@@ -2,4 +2,4 @@ XMLReader represents a reader that provides non-cached,
 forward-only access to XML data. It is based upon the 
 xmlTextReader api from libxml
 
-This extension is designed to only work under PHP 5.
+This extension is designed to only work under PHP 5+.
diff --git a/ext/xmlreader/xmlreader.dsp b/ext/xmlreader/xmlreader.dsp
index 7b21518ba3..a2a6c39460 100644
--- a/ext/xmlreader/xmlreader.dsp
+++ b/ext/xmlreader/xmlreader.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 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

+# ADD LINK32 php7ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

 

 !ELSEIF  "$(CFG)" == "xmlreader - Win32 Release_TS"

 

@@ -80,8 +80,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 php5ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

-# ADD LINK32 php5ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /incremental:no /machine:I386 /out:"..\..\Release_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

+# ADD BASE LINK32 php7ts_debug.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"..\..\Debug_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

+# ADD LINK32 php7ts.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib /nologo /dll /incremental:no /machine:I386 /out:"..\..\Release_TS/php_xmlreader.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\bindlib_w32\Release"

 # SUBTRACT LINK32 /debug

 

 !ENDIF 

diff --git a/ext/xmlrpc/xmlrpc.dsp b/ext/xmlrpc/xmlrpc.dsp
index 8c455d3fcd..cc87a169b6 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 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"

+# ADD LINK32 php7ts_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 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"

+# ADD LINK32 php7ts.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/xmlwriter/TODO b/ext/xmlwriter/TODO
index bfc895d769..858ad6be27 100644
--- a/ext/xmlwriter/TODO
+++ b/ext/xmlwriter/TODO
@@ -1,4 +1,4 @@
-- Fix up config file for PHP 5 to use libxml extension configuration
+- Fix up config file for PHP 7 to use libxml extension configuration
 - Add tests for Namespace functions/methods
 - Sync with xmlwriter (new dtd func?)
 - Write documentations in docbook
diff --git a/ext/xsl/xsl.dsp b/ext/xsl/xsl.dsp
index ff7257d161..0b8a56d7d2 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 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"

+# ADD LINK32 wsock32.lib php7ts.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 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"

+# ADD LINK32 php7ts_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/zlib/zlib.dsp b/ext/zlib/zlib.dsp
index 8986bc6f05..6a3e98de90 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 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"
+# 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 php7ts.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 php7ts.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 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"
+# 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 php7ts_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 php7ts_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 a4e01a4845..0c46a88831 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 php5.
+php_build is a directory at the same level as php7.
 
 Start Visual Studio, load php_modules.dsw, select the ZLIB projects, and build
 it.
diff --git a/makerpm b/makerpm
index 07bd372df4..4a33758a0a 100644
--- a/makerpm
+++ b/makerpm
@@ -37,8 +37,8 @@ sed -e "s/PVERSION/$VERSION/g" \
     -e "s/TARDIR/$TARDIR/g" \
     -e "s/PREQUIRES/$PREQUIRES/g" \
     > $SPEC <<'EOF'
-Summary: PHP 5 - A powerful scripting language
-Name: php5
+Summary: PHP 7 - A powerful scripting language
+Name: php7
 Version: PVERSION
 Release: PRELEASE
 Group: Networking/Daemons
@@ -48,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Requires: PREQUIRES
 
 %description
-PHP 5 is a powerful apache module that adds scripting and database connection
+PHP 7 is a powerful apache module that adds scripting and database connection
 capabilities to the apache server. This version includes the "php_cgi" binary
 for suExec and stand alone php scripts too.
 
@@ -103,7 +103,7 @@ mv php.keepme sapi/cgi/php
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
-install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp7.so $RPM_BUILD_ROOT%{_libdir}/apache
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi
@@ -168,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_libdir}/apache/libphp5.so
+%{_libdir}/apache/libphp7.so
 %{_bindir}/php
 %{_bindir}/php_cgi
 %{_mandir}/man1/php.1*
diff --git a/php.ini-development b/php.ini-development
index 562816fc44..41460485c7 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -867,8 +867,8 @@ default_socket_timeout = 60
 ;
 ; Windows Extensions
 ; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
+; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
 ;
 ;extension=php_bz2.dll
diff --git a/php.ini-production b/php.ini-production
index 34f91fe293..2c2ab78ac4 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -865,8 +865,8 @@ default_socket_timeout = 60
 ;
 ; Windows Extensions
 ; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
+; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
+; extension folders as well as the separate PECL DLL download (PHP 5+).
 ; Be sure to appropriately set the extension_dir directive.
 ;
 ;extension=php_bz2.dll
diff --git a/php5.spec.in b/php7.spec.in
index 97a84b5fb2..97a84b5fb2 100644
--- a/php5.spec.in
+++ b/php7.spec.in
diff --git a/sapi/aolserver/README b/sapi/aolserver/README
index 80c186ea5d..86af6a54b3 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}/libphp5.so
+ns_param php ${bindir}/libphp7.so
 
 
 =============================================================================
diff --git a/sapi/aolserver/php5aolserver.dsp b/sapi/aolserver/php7aolserver.dsp
index dd6ad71c53..04a80d187c 100644
--- a/sapi/aolserver/php5aolserver.dsp
+++ b/sapi/aolserver/php7aolserver.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5aolserver" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7aolserver" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5aolserver - Win32 Debug_TS

+CFG=php7aolserver - 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 "php5aolserver.mak".

+!MESSAGE NMAKE /f "php7aolserver.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 "php5aolserver.mak" CFG="php5aolserver - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7aolserver.mak" CFG="php7aolserver - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7aolserver - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7aolserver - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7aolserver - 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)" == "php5aolserver - Win32 Release_TS"

+!IF  "$(CFG)" == "php7aolserver - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7AOLSERVER_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 "PHP7AOLSERVER_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 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"

+# ADD LINK32 nsd.lib php7ts.lib kernel32.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/php7aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5aolserver - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7aolserver - 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 "PHP5AOLSERVER_EXPORTS" /YX /FD /c

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7AOLSERVER_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 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"

+# ADD LINK32 nsd.lib php7ts.lib kernel32.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/php7aolserver.so" /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5aolserver - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7aolserver - 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 "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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7AOLSERVER_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 "PHP7AOLSERVER_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 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"

+# ADD LINK32 nsd.lib php7ts_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/php7aolserver.so" /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "php5aolserver - Win32 Release_TS"

-# Name "php5aolserver - Win32 Release_TS_inline"

-# Name "php5aolserver - Win32 Debug_TS"

+# Name "php7aolserver - Win32 Release_TS"

+# Name "php7aolserver - Win32 Release_TS_inline"

+# Name "php7aolserver - 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/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl
index 5f77d9c9c9..c8b174775e 100644
--- a/sapi/apache/apMakefile.tmpl
+++ b/sapi/apache/apMakefile.tmpl
@@ -1,38 +1,38 @@
 ##
-##  Apache 1.3 Makefile template for PHP 5.0 Module
-##  [src/modules/php5/Makefile.tmpl]
+##  Apache 1.3 Makefile template for PHP 7.0 Module
+##  [src/modules/php7/Makefile.tmpl]
 ##
 
 #   the parametrized target
-LIB=libphp5.$(LIBEXT)
+LIB=libphp7.$(LIBEXT)
 
 #   objects for building the static library
-OBJS=mod_php5.o
-OBJS_LIB=libmodphp5.a
+OBJS=mod_php7.o
+OBJS_LIB=libmodphp7.a
 
 #   objects for building the shared object library
-SHLIB_OBJS=mod_php5.so-o
-SHLIB_OBJS_LIB=libmodphp5.a
+SHLIB_OBJS=mod_php7.so-o
+SHLIB_OBJS_LIB=libmodphp7.a
 
 #   the general targets
 all: lib
 lib: $(LIB)
 
 #   build the static library by merging the object files
-libphp5.a: $(OBJS) $(OBJS_LIB)
+libphp7.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
-libphp5.: $(OBJS) $(OBJS_LIB)
+libphp7.: $(OBJS) $(OBJS_LIB)
 	cp $(OBJS_LIB) $@
 	ar r $@ $(OBJS)
 	$(RANLIB) $@
-	cp libphp5. libphp5.a
+	cp libphp7. libphp7.a
 
 #   build the shared object library by linking the object files
-libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+libphp7.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_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+mod_php7.o: mod_php7.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_php5.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php7.h
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 7b0ee562eb..f5bfde4d68 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -78,7 +78,7 @@ if test "$PHP_APXS" != "no"; then
   *darwin*)
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
     PHP_SUBST(MH_BUNDLE_FLAGS)
-    SAPI_SHARED=libs/libphp5.so
+    SAPI_SHARED=libs/libphp7.so
     build_type=bundle
     ;;
   *)
@@ -86,26 +86,26 @@ if test "$PHP_APXS" != "no"; then
     ;;
   esac
 
-  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php5.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
+  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php7.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
 
   # Test whether apxs support -S option
   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
 
   if test "$?" != "0"; then
-    APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
+    APACHE_INSTALL="$APXS -i -a -n php7 $SAPI_SHARED" # Old apxs does not have -S option
   else 
     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
     if test -z `$APXS -q SYSCONFDIR`; then
       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                             -i -n php5 $SAPI_SHARED"
+                             -i -n php7 $SAPI_SHARED"
     else
       APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                             -i -a -n php5 $SAPI_SHARED"
+                             -i -a -n php7 $SAPI_SHARED"
     fi
   fi
 
@@ -135,7 +135,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
     PHP_APACHE=/usr/local/apache
   fi
 
-  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
+  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php7.* sapi/apache/libphp7.module"
 
   AC_DEFINE(HAVE_APACHE,1,[ ])
   APACHE_MODULE=yes
@@ -144,7 +144,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
   if test -f $PHP_APACHE/src/httpd.h; then 
     APACHE_INCLUDE=-I$PHP_APACHE/src
     APACHE_TARGET=$PHP_APACHE/src
-    PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+    PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php7.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])
@@ -159,13 +159,13 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
   elif test -f $PHP_APACHE/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
     APACHE_INCLUDE="-I$PHP_APACHE/src/main -I$PHP_APACHE/src/os/unix -I$PHP_APACHE/src/ap"
-    APACHE_TARGET=$PHP_APACHE/src/modules/php5
+    APACHE_TARGET=$PHP_APACHE/src/modules/php7
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-    PHP_SELECT_SAPI(apache, 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/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-    PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
+    PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
+    APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+    PHP_LIBS="-Lmodules/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
     AC_MSG_RESULT([yes - Apache 1.3.x])
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
@@ -183,13 +183,13 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
   elif test -f $PHP_APACHE/src/include/httpd.h; then
     APACHE_HAS_REGEX=1
     APACHE_INCLUDE="-I$PHP_APACHE/src/include -I$PHP_APACHE/src/os/unix"
-    APACHE_TARGET=$PHP_APACHE/src/modules/php5
+    APACHE_TARGET=$PHP_APACHE/src/modules/php7
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-    PHP_SELECT_SAPI(apache, 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/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+    PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
+    PHP_LIBS="-Lmodules/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
+    APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
     AC_MSG_RESULT([yes - Apache 1.3.x])
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
@@ -207,9 +207,9 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
   elif test -f $PHP_APACHE/apache/httpd.h; then
     APACHE_INCLUDE="-I$PHP_APACHE/apache -I$PHP_APACHE/ssl/include"
     APACHE_TARGET=$PHP_APACHE/apache
-    PHP_SELECT_SAPI(apache, 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"
+    PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
+    PHP_LIBS="-Lmodules/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
+    APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
     AC_MSG_RESULT([yes - StrongHold])
     if test -f $PHP_APACHE/apache/ap_config.h; then
@@ -247,13 +247,13 @@ dnl Build as static module
 if test "$APACHE_MODULE" = "yes"; then
   PHP_TARGET_RDYNAMIC
   $php_shtool mkdir -p sapi/apache
-  PHP_OUTPUT(sapi/apache/libphp5.module)
+  PHP_OUTPUT(sapi/apache/libphp7.module)
 fi
 
 dnl General
 if test -n "$APACHE_INSTALL"; then
   if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
-    APXS_EXP=-bE:sapi/apache/mod_php5.exp
+    APXS_EXP=-bE:sapi/apache/mod_php7.exp
   fi
 
   PHP_APACHE_FD_CHECK
diff --git a/sapi/apache/config.w32 b/sapi/apache/config.w32
index e876d7500e..e5b72f1bcf 100644
--- a/sapi/apache/config.w32
+++ b/sapi/apache/config.w32
@@ -15,9 +15,9 @@ if (PHP_APACHE != "no") {
 				";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
 		// We need to play tricks to get our readdir.h used by apache
 		// headers
-		SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
+		SAPI('apache', 'mod_php7.c sapi_apache.c php_apache.c',
 				'php' + PHP_VERSION + 'apache.dll',
-				'/D APACHEPHP5_EXPORTS /D APACHE_READDIR_H /I win32');
+				'/D APACHEPHP7_EXPORTS /D APACHE_READDIR_H /I win32');
 	} else {
 		WARNING("Could not find apache libraries/headers");
 	}
diff --git a/sapi/apache/libphp5.module.in b/sapi/apache/libphp7.module.in
index 00d9c49f40..892df4d5cc 100644
--- a/sapi/apache/libphp5.module.in
+++ b/sapi/apache/libphp7.module.in
@@ -1,4 +1,4 @@
-Name: php5_module
+Name: php7_module
 ConfigStart
 	RULE_WANTHSREGEX=no
 	RULE_HIDE=yes
diff --git a/sapi/apache/mod_php5.exp b/sapi/apache/mod_php5.exp
deleted file mode 100644
index 9ad0f0a0ad..0000000000
--- a/sapi/apache/mod_php5.exp
+++ /dev/null
@@ -1 +0,0 @@
-php5_module
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php7.c
index 8b3d0f4383..687586952f 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php7.c
@@ -60,12 +60,12 @@ static CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, HashTable *con
 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, HashTable *conf, char *arg1, char *arg2);
 
-/* ### these should be defined in mod_php5.h or somewhere else */
+/* ### these should be defined in mod_php7.h or somewhere else */
 #define USE_PATH 1
 #define IGNORE_URL 2
 #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST POSSIBLE STATUS DESCRIPTION")
 
-module MODULE_VAR_EXPORT php5_module;
+module MODULE_VAR_EXPORT php7_module;
 
 int saved_umask;
 static unsigned char apache_php_initialized;
@@ -622,7 +622,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
 			return DECLINED;
 		}
 
-		per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
+		per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php7_module);
 		if (per_dir_conf) {
 			zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
 		}
@@ -909,7 +909,7 @@ static int php_xbithack_handler(request_rec * r)
 	if (!(r->finfo.st_mode & S_IXUSR)) {
 		return DECLINED;
 	}
-	per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
+	per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php7_module);
 	if (per_dir_conf) {
 		zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
 	}
@@ -1006,9 +1006,9 @@ command_rec php_commands[] =
 };
 /* }}} */
 
-/* {{{ odule MODULE_VAR_EXPORT php5_module
+/* {{{ odule MODULE_VAR_EXPORT php7_module
  */
-module MODULE_VAR_EXPORT php5_module =
+module MODULE_VAR_EXPORT php7_module =
 {
 	STANDARD_MODULE_STUFF,
 	php_init_handler,			/* initializer */
diff --git a/sapi/apache/mod_php7.exp b/sapi/apache/mod_php7.exp
new file mode 100644
index 0000000000..1469b0314d
--- /dev/null
+++ b/sapi/apache/mod_php7.exp
@@ -0,0 +1 @@
+php7_module
diff --git a/sapi/apache/mod_php5.h b/sapi/apache/mod_php7.h
index 477ef5742e..947d8b44d4 100644
--- a/sapi/apache/mod_php5.h
+++ b/sapi/apache/mod_php7.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#ifndef MOD_PHP5_H
-#define MOD_PHP5_H
+#ifndef MOD_PHP7_H
+#define MOD_PHP7_H
 
 #if !defined(WIN32) && !defined(WINNT)
 #ifndef MODULE_VAR_EXPORT
@@ -50,7 +50,7 @@ extern php_apache_info_struct php_apache_info;
 # define MODULE_VAR_EXPORT PHPAPI
 #endif
 
-#endif							/* MOD_PHP5_H */
+#endif							/* MOD_PHP7_H */
 
 /*
  * Local variables:
diff --git a/sapi/apache/php.sym b/sapi/apache/php.sym
index 9ad0f0a0ad..1469b0314d 100644
--- a/sapi/apache/php.sym
+++ b/sapi/apache/php.sym
@@ -1 +1 @@
-php5_module
+php7_module
diff --git a/sapi/apache/php5apache.dsp b/sapi/apache/php7apache.dsp
index fbdb7612b8..1b2e0e5f22 100644
--- a/sapi/apache/php5apache.dsp
+++ b/sapi/apache/php7apache.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5apache" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7apache" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5apache - Win32 Release_TS

+CFG=php7apache - 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 "php5apache.mak".

+!MESSAGE NMAKE /f "php7apache.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 "php5apache.mak" CFG="php5apache - Win32 Release_TS"

+!MESSAGE NMAKE /f "php7apache.mak" CFG="php7apache - Win32 Release_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7apache - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7apache - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7apache - 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)" == "php5apache - Win32 Release_TS"

+!IF  "$(CFG)" == "php7apache - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts.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)" == "php5apache - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7apache - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts_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)" == "php5apache - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7apache - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts.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 "php5apache - Win32 Release_TS"

-# Name "php5apache - Win32 Debug_TS"

-# Name "php5apache - Win32 Release_TS_inline"

+# Name "php7apache - Win32 Release_TS"

+# Name "php7apache - Win32 Debug_TS"

+# Name "php7apache - 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_php5.c

+SOURCE=.\mod_php7.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_php5.h

+SOURCE=.\mod_php7.h

 # End Source File

 # Begin Source File

 

diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index 4834d8212d..ed586372d7 100644
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -67,4 +67,4 @@
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
 
-#include "mod_php5.h"
+#include "mod_php7.h"
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index b6524fd874..11cc051015 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -71,14 +71,14 @@ if test "$PHP_APXS2FILTER" != "no"; then
   if test -z `$APXS -q SYSCONFDIR`; then
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                       -i -n php5"
+                       -i -n php7"
   else
     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                       -i -a -n php5"
+                       -i -a -n php7"
   fi
 
   case $host_alias in
@@ -101,7 +101,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
     MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
     PHP_SUBST(MH_BUNDLE_FLAGS)
     PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
-    SAPI_SHARED=libs/libphp5.so
+    SAPI_SHARED=libs/libphp7.so
     INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
     ;;
   *beos*)
diff --git a/sapi/apache2filter/php.sym b/sapi/apache2filter/php.sym
index 9ad0f0a0ad..1469b0314d 100644
--- a/sapi/apache2filter/php.sym
+++ b/sapi/apache2filter/php.sym
@@ -1 +1 @@
-php5_module
+php7_module
diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index a6dc73c9fe..7918cf6de8 100644
--- a/sapi/apache2filter/php_apache.h
+++ b/sapi/apache2filter/php_apache.h
@@ -26,7 +26,7 @@
 #include "http_core.h"
 
 /* Declare this so we can get to it from outside the sapi_apache2.c file */
-extern module AP_MODULE_DECLARE_DATA php5_module;
+extern module AP_MODULE_DECLARE_DATA php7_module;
 
 /* A way to specify the location of the php.ini dir in an apache directive */
 extern char *apache2_php_ini_path_override;
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index ff2d46201b..9d159327c0 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -456,7 +456,7 @@ static void php_apache_request_dtor(ap_filter_t *f TSRMLS_DC)
 static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
 	php_struct *ctx;
-	void *conf = ap_get_module_config(f->r->per_dir_config, &php5_module);
+	void *conf = ap_get_module_config(f->r->per_dir_config, &php7_module);
 	char *p = get_php_config(conf, "engine", sizeof("engine"));
 	zend_file_handle zfd;
 	php_apr_bucket_brigade *pbb;
@@ -740,7 +740,7 @@ static size_t php_apache_fsizer_stream(void *handle TSRMLS_DC)
 	return 0;
 }
 
-AP_MODULE_DECLARE_DATA module php5_module = {
+AP_MODULE_DECLARE_DATA module php7_module = {
 	STANDARD20_MODULE_STUFF,
 	create_php_config,		/* create per-directory config structure */
 	merge_php_config,		/* merge per-directory config structures */
diff --git a/sapi/apache_hooks/apMakefile.tmpl b/sapi/apache_hooks/apMakefile.tmpl
index 4054e8e119..1e5e465f65 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/php5/Makefile.tmpl]
+##  [src/modules/php7/Makefile.tmpl]
 ##
 
 #   the parametrized target
-LIB=libphp5.$(LIBEXT)
+LIB=libphp7.$(LIBEXT)
 
 #   objects for building the static library
-OBJS=mod_php5.o
-OBJS_LIB=libmodphp5.a
+OBJS=mod_php7.o
+OBJS_LIB=libmodphp7.a
 
 #   objects for building the shared object library
-SHLIB_OBJS=mod_php5.so-o
-SHLIB_OBJS_LIB=libmodphp5.a
+SHLIB_OBJS=mod_php7.so-o
+SHLIB_OBJS_LIB=libmodphp7.a
 
 #   the general targets
 all: lib
 lib: $(LIB)
 
 #   build the static library by merging the object files
-libphp5.a: $(OBJS) $(OBJS_LIB)
+libphp7.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
-libphp5.: $(OBJS) $(OBJS_LIB)
+libphp7.: $(OBJS) $(OBJS_LIB)
 	cp $(OBJS_LIB) $@
 	ar r $@ $(OBJS)
 	$(RANLIB) $@
-	cp libphp5. libphp5.a
+	cp libphp7. libphp7.a
 
 #   build the shared object library by linking the object files
-libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+libphp7.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_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+mod_php7.o: mod_php7.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_php5.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php7.h
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index e2c71b4274..a1ee213492 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -79,7 +79,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
   *darwin*)
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
     PHP_SUBST(MH_BUNDLE_FLAGS)
-    SAPI_SHARED=libs/libphp5.so
+    SAPI_SHARED=libs/libphp7.so
     build_type=bundle
     ;;
   *)
@@ -87,26 +87,26 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
     ;;
   esac
 
-  PHP_SELECT_SAPI(apache_hooks, $build_type, sapi_apache.c mod_php5.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
+  PHP_SELECT_SAPI(apache_hooks, $build_type, sapi_apache.c mod_php7.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
 
   # Test whether apxs support -S option
   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
 
   if test "$?" != "0"; then
-    APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
+    APACHE_HOOKS_INSTALL="$APXS -i -a -n php7 $SAPI_SHARED" # Old apxs does not have -S option
   else 
     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
     if test -z `$APXS -q SYSCONFDIR`; then
       APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                             -i -n php5 $SAPI_SHARED"
+                             -i -n php7 $SAPI_SHARED"
     else
       APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
       APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                             -i -a -n php5 $SAPI_SHARED"
+                             -i -a -n php7 $SAPI_SHARED"
     fi
   fi
 
@@ -137,7 +137,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
     PHP_APACHE_HOOKS_STATIC=/usr/local/apache
   fi
 
-  APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module"
+  APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php7.* sapi/apache_hooks/libphp7.module"
 
   AC_DEFINE(HAVE_APACHE,1,[ ])
   APACHE_HOOKS_MODULE=yes
@@ -146,7 +146,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
   if test -f $PHP_APACHE_HOOKS_STATIC/src/httpd.h; then 
     APACHE_INCLUDE=-I$PHP_APACHE_HOOKS_STATIC/src
     APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src
-    PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+    PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     PHP_LIBS="-L. -lphp3"
     AC_MSG_RESULT([yes - Apache 1.2.x])
@@ -161,13 +161,13 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
   elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
     APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/src/main -I$PHP_APACHE_HOOKS_STATIC/src/os/unix -I$PHP_APACHE_HOOKS_STATIC/src/ap"
-    APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php5
+    APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php7
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-    PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
-    APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_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"
+    PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
+    APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_HOOKS_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/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
     AC_MSG_RESULT([yes - Apache 1.3.x])
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
@@ -185,13 +185,13 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
   elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/httpd.h; then
     APACHE_HAS_REGEX=1
     APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/src/include -I$PHP_APACHE_HOOKS_STATIC/src/os/unix"
-    APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php5
+    APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/src/modules/php7
     if test ! -d $APACHE_TARGET; then
       mkdir $APACHE_TARGET
     fi
-    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_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_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_php7.c php_apache.c, $APACHE_INCLUDE)
+    PHP_LIBS="-Lmodules/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
+    APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_HOOKS_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 $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
@@ -209,9 +209,9 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
   elif test -f $PHP_APACHE_HOOKS_STATIC/apache/httpd.h; then
     APACHE_INCLUDE="-I$PHP_APACHE_HOOKS_STATIC/apache -I$PHP_APACHE_HOOKS_STATIC/ssl/include"
     APACHE_TARGET=$PHP_APACHE_HOOKS_STATIC/apache
-    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_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
+    PHP_SELECT_SAPI(apache_hooks, static, sapi_apache.c mod_php7.c php_apache.c, $APACHE_INCLUDE)
+    PHP_LIBS="-Lmodules/php7 -L../modules/php7 -L../../modules/php7 -lmodphp7"
+    APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp7.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
     AC_MSG_RESULT([yes - StrongHold])
     if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then
@@ -249,13 +249,13 @@ dnl Build as static module
 if test "$APACHE_HOOKS_MODULE" = "yes"; then
   PHP_TARGET_RDYNAMIC
   $php_shtool mkdir -p sapi/apache_hooks
-  PHP_OUTPUT(sapi/apache_hooks/libphp5.module)
+  PHP_OUTPUT(sapi/apache_hooks/libphp7.module)
 fi
 
 dnl General
 if test -n "$APACHE_HOOKS_INSTALL"; then
   if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
-    APXS_EXP=-bE:sapi/apache_hooks/mod_php5.exp
+    APXS_EXP=-bE:sapi/apache_hooks/mod_php7.exp
   fi
 
   PHP_APACHE_FD_CHECK
diff --git a/sapi/apache_hooks/config.w32 b/sapi/apache_hooks/config.w32
index 85dc624d60..1c9129e615 100644
--- a/sapi/apache_hooks/config.w32
+++ b/sapi/apache_hooks/config.w32
@@ -12,9 +12,9 @@ if (PHP_APACHE_HOOKS != "no") {
 				";" + PHP_PHP_BUILD + "\\apache\\src\\corer")) {
 		// We need to play tricks to get our readdir.h used by apache
 		// headers
-		SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
+		SAPI('apache_hooks', 'mod_php7.c sapi_apache.c php_apache.c',
 				'php' + PHP_VERSION + 'apache_hooks.dll',
-				'/D APACHEPHP5_EXPORTS /D APACHE_READDIR_H /I win32');
+				'/D APACHEPHP7_EXPORTS /D APACHE_READDIR_H /I win32');
 	} else {
 		WARNING("Could not find apache libraries/headers");
 	}
diff --git a/sapi/apache_hooks/libphp5.module.in b/sapi/apache_hooks/libphp7.module.in
index 8488181897..5bea79ef95 100644
--- a/sapi/apache_hooks/libphp5.module.in
+++ b/sapi/apache_hooks/libphp7.module.in
@@ -1,4 +1,4 @@
-Name: php5_module
+Name: php7_module
 ConfigStart
 	RULE_WANTHSREGEX=no
 	RULE_HIDE=yes
diff --git a/sapi/apache_hooks/mod_php5.exp b/sapi/apache_hooks/mod_php5.exp
deleted file mode 100644
index 9ad0f0a0ad..0000000000
--- a/sapi/apache_hooks/mod_php5.exp
+++ /dev/null
@@ -1 +0,0 @@
-php5_module
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php7.c
index 901d3b57a3..33e0931fb6 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php7.c
@@ -84,11 +84,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_php5.h or somewhere else */
+/* ### these should be defined in mod_php7.h or somewhere else */
 #define USE_PATH 1
 #define IGNORE_URL 2
 
-module MODULE_VAR_EXPORT php5_module;
+module MODULE_VAR_EXPORT php7_module;
 
 int saved_umask;
 /* static int setup_env = 0; */
@@ -667,7 +667,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, &php5_module);
+		per_dir_conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_module);
 		if (per_dir_conf) {
 			zend_hash_apply((HashTable *) per_dir_conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
 		}
@@ -934,7 +934,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, &php5_module);
+	conf = get_module_config(s->module_config, &php7_module);
 	switch(handler_stage) {
 		case AP_URI_TRANS:
 			sapi_stack_push(&conf->uri_handlers, handler);
@@ -1184,7 +1184,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_module);
 	if (conf) {
 		zend_hash_apply((HashTable *) conf->ini_settings, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
 	}
@@ -1266,7 +1266,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, &php5_module);
+		conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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;
@@ -1298,7 +1298,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, &php5_module);
+	conf = (php_per_server_config *) get_module_config(r->server->module_config, &php7_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);
@@ -1309,7 +1309,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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);
@@ -1320,7 +1320,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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);
@@ -1332,7 +1332,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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);
@@ -1345,7 +1345,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_module);
 	return sapi_stack_apply_with_argument_stop_if_equals(&conf->type_handlers,
 			ZEND_STACK_APPLY_BOTTOMUP,
 			(int (*)(void *element, void *)) php_run_hook,
@@ -1357,7 +1357,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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,
@@ -1369,7 +1369,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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,
@@ -1382,11 +1382,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, &php5_module);
+	svr = get_module_config(r->server->module_config, &php7_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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_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);
@@ -1397,7 +1397,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, &php5_module);
+	conf = (php_per_dir_config *) get_module_config(r->per_dir_config, &php7_module);
 	return sapi_stack_apply_with_argument_all(&conf->response_handlers, ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_run_hook, r);
 }
 
@@ -1449,9 +1449,9 @@ command_rec php_commands[] =
 };
 /* }}} */
 
-/* {{{ module MODULE_VAR_EXPORT php5_module
+/* {{{ module MODULE_VAR_EXPORT php7_module
  */
-module MODULE_VAR_EXPORT php5_module =
+module MODULE_VAR_EXPORT php7_module =
 {
 	STANDARD_MODULE_STUFF,
 	php_init_handler,			/* initializer */
diff --git a/sapi/apache_hooks/mod_php7.exp b/sapi/apache_hooks/mod_php7.exp
new file mode 100644
index 0000000000..1469b0314d
--- /dev/null
+++ b/sapi/apache_hooks/mod_php7.exp
@@ -0,0 +1 @@
+php7_module
diff --git a/sapi/apache_hooks/mod_php5.h b/sapi/apache_hooks/mod_php7.h
index eb23933773..325ae1f721 100644
--- a/sapi/apache_hooks/mod_php5.h
+++ b/sapi/apache_hooks/mod_php7.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#ifndef MOD_PHP5_H
-#define MOD_PHP5_H
+#ifndef MOD_PHP7_H
+#define MOD_PHP7_H
 
 #if !defined(WIN32) && !defined(WINNT)
 #ifndef MODULE_VAR_EXPORT
@@ -78,7 +78,7 @@ extern php_apache_info_struct php_apache_info;
 # define MODULE_VAR_EXPORT PHPAPI
 #endif
 
-#endif							/* MOD_PHP5_H */
+#endif							/* MOD_PHP7_H */
 
 /*
  * Local variables:
diff --git a/sapi/apache_hooks/php.sym b/sapi/apache_hooks/php.sym
index 9ad0f0a0ad..1469b0314d 100644
--- a/sapi/apache_hooks/php.sym
+++ b/sapi/apache_hooks/php.sym
@@ -1 +1 @@
-php5_module
+php7_module
diff --git a/sapi/apache_hooks/php5apache_hooks.dsp b/sapi/apache_hooks/php7apache_hooks.dsp
index cc60f4b3b1..2a786cd749 100755..100644
--- a/sapi/apache_hooks/php5apache_hooks.dsp
+++ b/sapi/apache_hooks/php7apache_hooks.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5apache_hooks" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7apache_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=php5apache_hooks - Win32 Release_TS

+CFG=php7apache_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 "php5apache_hooks.mak".

+!MESSAGE NMAKE /f "php7apache_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 "php5apache_hooks.mak" CFG="php5apache_hooks - Win32 Release_TS"

+!MESSAGE NMAKE /f "php7apache_hooks.mak" CFG="php7apache_hooks - Win32 Release_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7apache_hooks - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7apache_hooks - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7apache_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)" == "php5apache_hooks - Win32 Release_TS"

+!IF  "$(CFG)" == "php7apache_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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts.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)" == "php5apache_hooks - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7apache_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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts_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/php7apache_hooks.dll" /pdbtype:sept /libpath:"..\..\..\php_build\apache\src\cored" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5apache_hooks - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7apache_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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "APACHEPHP7_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 "APACHEPHP7_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 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"

+# ADD LINK32 php7ts.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 "php5apache_hooks - Win32 Release_TS"

-# Name "php5apache_hooks - Win32 Debug_TS"

-# Name "php5apache_hooks - Win32 Release_TS_inline"

+# Name "php7apache_hooks - Win32 Release_TS"

+# Name "php7apache_hooks - Win32 Debug_TS"

+# Name "php7apache_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_php5.c

+SOURCE=.\mod_php7.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_php5.h

+SOURCE=.\mod_php7.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 23cf7fea69..e6610741c7 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_php5.h"
+#include "mod_php7.h"
 
 
 zval *php_apache_request_new(request_rec *r);
diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 49d0f768bb..b1ffddb460 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 PHP5 since
+/* Ok, we are now using Pike level threads to handle PHP7 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 PHP5 module requires that your Pike has thread support.
+#error The PHP7 module requires that your Pike has thread support.
 #endif
 
 #undef HIDE_GLOBAL_VARIABLES
@@ -625,7 +625,7 @@ static void php_caudium_module_main(php_caudium_request *ureq)
     SG(request_info).headers_only = 0;
   }
 
-  /* Let PHP5 handle the deconding of the AUTH */
+  /* Let PHP7 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
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index 5ce55f3f01..13a6b2943e 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -79,12 +79,12 @@ if test "$PHP_CAUDIUM" != "no"; then
       AC_MSG_RESULT(not found)
     fi
   else
-    AC_MSG_ERROR([Caudium PHP5 requires Pike 7.0 or newer])
+    AC_MSG_ERROR([Caudium PHP7 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 $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP5.so"
+  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_CAUDIUM/lib/$PIKE_VERSION/PHP7.so"
   RESULT="  *** Pike binary used:         $PIKE
   *** Pike include dir(s) used: $PIKE_INCLUDE_DIR
   *** Pike version:             $PIKE_VERSION"
diff --git a/sapi/cgi/CHANGES b/sapi/cgi/CHANGES
index de029474e5..b7cf41cf5e 100755
--- a/sapi/cgi/CHANGES
+++ b/sapi/cgi/CHANGES
@@ -31,4 +31,3 @@ In PHP5.3 all additional configure options (except --enable-cgi) are removed:
 
                             Now it is disabled by default, but can be enabled
                             with ini directive "cgi.discard_path=1".
-
diff --git a/sapi/cgi/README.FastCGI b/sapi/cgi/README.FastCGI
index 3dda295d84..f0f11e102d 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 php5_module /usr/lib/apache/2.0/libphp5.so
+    #LoadModule php7_module /usr/lib/apache/2.0/libphp7.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/cli/config.m4 b/sapi/cli/config.m4
index 9a1b98da46..090574a007 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -45,7 +45,7 @@ if test "$PHP_CLI" != "no"; then
     BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   *netware*)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp7lib -o \$(SAPI_CLI_PATH)"
     ;;
   *)
     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
diff --git a/sapi/embed/php5embed.dsp b/sapi/embed/php7embed.dsp
index 8564b11797..9df89a0478 100644
--- a/sapi/embed/php5embed.dsp
+++ b/sapi/embed/php7embed.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="php5embed" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7embed" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=php5embed - Win32 Debug_TS

+CFG=php7embed - 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 "php5embed.mak".

+!MESSAGE NMAKE /f "php7embed.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 "php5embed.mak" CFG="php5embed - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7embed.mak" CFG="php7embed - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "php5embed - Win32 Debug_TS" (based on "Win32 (x86) Static Library")

-!MESSAGE "php5embed - Win32 Release_TS" (based on "Win32 (x86) Static Library")

+!MESSAGE "php7embed - Win32 Debug_TS" (based on "Win32 (x86) Static Library")

+!MESSAGE "php7embed - Win32 Release_TS" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=php5embed - Win32 Debug_TS
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "php5embed - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7embed - 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\php5embed.lib"

+# ADD LIB32 /nologo /out:"..\..\Debug_TS\php7embed.lib"

 

-!ELSEIF  "$(CFG)" == "php5embed - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7embed - 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\php5embed.lib"

+# ADD LIB32 /nologo /out:"..\..\Release_TS\php7embed.lib"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "php5embed - Win32 Debug_TS"

-# Name "php5embed - Win32 Release_TS"

+# Name "php7embed - Win32 Debug_TS"

+# Name "php7embed - Win32 Release_TS"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index c5f4abc59c..a355df2a57 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -490,7 +490,7 @@ pm.max_spare_servers = 3
 ; exectute php code.
 ; Note: set an empty value to allow all extensions.
 ; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
  
 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
 ; the current environment.
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 6014bab09f..4073173eaf 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -15,7 +15,7 @@ if test "$PHP_ISAPI" != "no"; then
   PHP_BUILD_THREAD_SAFE
   AC_DEFINE(WITH_ZEUS, 1, [ ])
   PHP_ADD_INCLUDE($ZEUSPATH/web/include)
-  PHP_SELECT_SAPI(isapi, shared, php5isapi.c)
+  PHP_SELECT_SAPI(isapi, shared, php7isapi.c)
   INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/"
 fi
 
diff --git a/sapi/isapi/config.w32 b/sapi/isapi/config.w32
index 8012352744..5a359f11b2 100644
--- a/sapi/isapi/config.w32
+++ b/sapi/isapi/config.w32
@@ -7,7 +7,7 @@ if (PHP_ISAPI == "yes") {
 	if (PHP_ZTS == "no") {
 		WARNING("ISAPI module requires an --enable-zts build of PHP");
 	} else {
-		SAPI('isapi', 'php5isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP5ISAPI_EXPORTS');
-		ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php5isapi.def');
+		SAPI('isapi', 'php7isapi.c', 'php' + PHP_VERSION + 'isapi.dll', '/D PHP7ISAPI_EXPORTS');
+		ADD_FLAG('LDFLAGS_ISAPI', '/DEF:sapi\\isapi\\php7isapi.def');
 	}
 }
diff --git a/sapi/isapi/php5isapi.c b/sapi/isapi/php7isapi.c
index 27eb1c9353..27eb1c9353 100644
--- a/sapi/isapi/php5isapi.c
+++ b/sapi/isapi/php7isapi.c
diff --git a/sapi/isapi/php5isapi.def b/sapi/isapi/php7isapi.def
index 596023ef55..596023ef55 100644
--- a/sapi/isapi/php5isapi.def
+++ b/sapi/isapi/php7isapi.def
diff --git a/sapi/isapi/php5isapi.dsp b/sapi/isapi/php7isapi.dsp
index 3dbab11eff..0952e54d9a 100644
--- a/sapi/isapi/php5isapi.dsp
+++ b/sapi/isapi/php7isapi.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php5isapi" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7isapi" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5isapi - Win32 Debug_TS

+CFG=php7isapi - 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 "php5isapi.mak".

+!MESSAGE NMAKE /f "php7isapi.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 "php5isapi.mak" CFG="php5isapi - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7isapi.mak" CFG="php7isapi - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7isapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7isapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7isapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7isapi - 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)" == "php5isapi - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7isapi - 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 "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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7ISAPI_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 "PHP7ISAPI_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 php5ts_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 php7ts_debug.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5isapi - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7isapi - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7ISAPI_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 "PHP7ISAPI_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 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 php7ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5isapi - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7isapi - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5isapi___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5isapi___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7isapi___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7isapi___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 "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 CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP7ISAPI_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 "PHP7ISAPI_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 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"

+# 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 php7ts.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 php7ts.lib /nologo /version:4.0 /dll /machine:I386 /libpath:"..\..\Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5isapi - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7isapi - Win32 Release_TSDbg"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5isapi___Win32_Release_TSDbg"

-# PROP BASE Intermediate_Dir "php5isapi___Win32_Release_TSDbg"

+# PROP BASE Output_Dir "php7isapi___Win32_Release_TSDbg"

+# PROP BASE Intermediate_Dir "php7isapi___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 "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 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 "PHP7ISAPI_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 "PHP7ISAPI_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 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"

+# 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 php7ts.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 php7ts.lib /nologo /version:4.0 /dll /debug /machine:I386 /libpath:"..\..\Release_TSDbg"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "php5isapi - Win32 Debug_TS"

-# Name "php5isapi - Win32 Release_TS"

-# Name "php5isapi - Win32 Release_TS_inline"

-# Name "php5isapi - Win32 Release_TSDbg"

+# Name "php7isapi - Win32 Debug_TS"

+# Name "php7isapi - Win32 Release_TS"

+# Name "php7isapi - Win32 Release_TS_inline"

+# Name "php7isapi - Win32 Release_TSDbg"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\php5isapi.c

+SOURCE=.\php7isapi.c

 # End Source File

 # Begin Source File

 

-SOURCE=.\php5isapi.def

+SOURCE=.\php7isapi.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 f58ab3c0e9..e6d10dd486 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:\php5-source
+Run: stresstest T c:\php7-source
 
 
 
diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp
index 9a5964a6ba..8ad414fab6 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 'php5isapi.dll' not found -%d\n%s\n", GetLastError(), lpMsgBuf);
+		fprintf(stderr,"Error: Dll 'php7isapi.dll' not found -%d\n%s\n", GetLastError(), lpMsgBuf);
 		free (module);
 		free(filelist);
 		LocalFree( lpMsgBuf );
diff --git a/sapi/nsapi/nsapi-readme.txt b/sapi/nsapi/nsapi-readme.txt
index 54980bf0e0..812507957e 100644
--- a/sapi/nsapi/nsapi-readme.txt
+++ b/sapi/nsapi/nsapi-readme.txt
@@ -1,4 +1,4 @@
-Configuration of your Netscape/iPlanet/Sun Webserver for PHP5
+Configuration of your Netscape/iPlanet/Sun Webserver for PHP7
 -----------------------------------------------------------------
 
 These instructions are targetted at Netscape Enterprise Web Server and
@@ -28,13 +28,13 @@ Place the following two lines after mime.types init in
 for iPlanet/Sun Webserver 6.0 and above however at the end of the
 <path-to-server>/https-servername/config/magnus.conf file:
 
-    Init fn="load-modules" funcs="php5_init,php5_execute,php5_auth_trans" shlib="/path/to/phplibrary"
-    Init fn=php5_init errorString="Failed to initialize PHP!" [php_ini="/path/to/php.ini"]
+    Init fn="load-modules" funcs="php7_init,php7_execute,php7_auth_trans" shlib="/path/to/phplibrary"
+    Init fn=php7_init errorString="Failed to initialize PHP!" [php_ini="/path/to/php.ini"]
 
 The "shlib" will vary depending on your OS:
 
-	Unix: "<path-to-server>/bin/libphp5.so".
-	Windows: "c:/path/to/php5/php5nsapi.dll"
+	Unix: "<path-to-server>/bin/libphp7.so".
+	Windows: "c:/path/to/php7/php7nsapi.dll"
 
 
 In obj.conf (for virtual server classes [Sun 6.0+] in their vserver.obj.conf):
@@ -50,7 +50,7 @@ In obj.conf (for virtual server classes [Sun 6.0+] in their vserver.obj.conf):
     # For boolean ini-keys please use 0/1 as value, NOT "On","Off",... (this will not work
     # correctly), e.g. zlib.output_compression=1 instead of zlib.output_compression="On"
 
-    Service fn="php5_execute" type="magnus-internal/x-httpd-php" [inikey=value ...]
+    Service fn="php7_execute" type="magnus-internal/x-httpd-php" [inikey=value ...]
     .
     .
     .
@@ -61,7 +61,7 @@ PHP scripts (same like a cgi-bin directory):
 
     <Object name="x-httpd-php">
     ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
-    Service fn="php5_execute" [inikey=value ...]
+    Service fn="php7_execute" [inikey=value ...]
     </Object>
 
 After that you can configure a directory in the Administration server and assign it
@@ -81,7 +81,7 @@ AUTHENTICATION IS PASSED TO YOUR PHP SCRIPT.  To configure PHP
 Authentication for the entire server, add the following line:
 
     <Object name="default">
-    AuthTrans fn=php5_auth_trans
+    AuthTrans fn=php7_auth_trans
     .
     .
     .
@@ -92,7 +92,7 @@ Authentication for the entire server, add the following line:
 To use PHP Authentication on a single directory, add the following:
 
     <Object ppath="d:\path\to\authenticated\dir\*">
-    AuthTrans fn=php5_auth_trans
+    AuthTrans fn=php7_auth_trans
     </Object>
 
 
@@ -103,7 +103,7 @@ You can use PHP to generate the error pages for "404 Not Found"
 or similar. Add the following line to the object in obj.conf for
 every error page you want to overwrite:
 
-    Error fn="php5_execute" code=XXX script="/path/to/script.php" [inikey=value inikey=value...]
+    Error fn="php7_execute" code=XXX script="/path/to/script.php" [inikey=value inikey=value...]
 
 where XXX ist the HTTP error code. Please delete any other Error
 directives which could interfere with yours.
@@ -116,7 +116,7 @@ Just generate a PHP script which displays a directory listing and
 replace the corresponding default Service line for
 type="magnus-internal/directory" in obj.conf with the following:
 
-    Service fn="php5_execute" type="magnus-internal/directory" script="/path/to/script.php" [inikey=value inikey=value...]
+    Service fn="php7_execute" type="magnus-internal/directory" script="/path/to/script.php" [inikey=value inikey=value...]
 
 For both error and directory listing pages the original URI and
 translated URI are in the variables $_SERVER['PATH_INFO'] and
@@ -141,9 +141,9 @@ till version 6.1. If a newer version of the Sun server is used, the detection
 fails and nsapi_virtual() is disabled.
 
 If this is the case, try the following:
-Add the following parameter to php5_init in magnus.conf:
+Add the following parameter to php7_init in magnus.conf:
 
-    Init fn=php5_init ... server_lib="ns-httpdXX.dll"
+    Init fn=php7_init ... server_lib="ns-httpdXX.dll"
     
 where XX is the correct DLL version number. To get it, look in the server-root
 for the correct DLL name. The DLL with the biggest filesize is the right one.
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 74b5caa3a1..bb99c31652 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -251,7 +251,7 @@ static void php_nsapi_init_dynamic_symbols(void)
 		/* try user specified server_lib */
 		module = GetModuleHandle(nsapi_dll);
 		if (!module) {
-			log_error(LOG_WARN, "php5_init", NULL, NULL, "Cannot find DLL specified by server_lib parameter: %s", nsapi_dll);
+			log_error(LOG_WARN, "php7_init", NULL, NULL, "Cannot find DLL specified by server_lib parameter: %s", nsapi_dll);
 		}
 	} else {
 		/* find a LOADED dll module from nsapi_dlls */
@@ -781,7 +781,7 @@ static void nsapi_log_message(char *message TSRMLS_DC)
 	if (rc) {
 		log_error(LOG_INFORM, pblock_findval("fn", rc->pb), rc->sn, rc->rq, "%s", message);
 	} else {
-		log_error(LOG_INFORM, "php5", NULL, NULL, "%s", message);
+		log_error(LOG_INFORM, "php7", NULL, NULL, "%s", message);
 	}
 }
 
@@ -868,7 +868,7 @@ static void nsapi_php_ini_entries(NSLS_D TSRMLS_DC)
   	}
 }
 
-void NSAPI_PUBLIC php5_close(void *vparam)
+void NSAPI_PUBLIC php7_close(void *vparam)
 {
 	if (nsapi_sapi_module.shutdown) {
 		nsapi_sapi_module.shutdown(&nsapi_sapi_module);
@@ -888,13 +888,13 @@ void NSAPI_PUBLIC php5_close(void *vparam)
 	sapi_shutdown();
 	tsrm_shutdown();
 
-	log_error(LOG_INFORM, "php5_close", NULL, NULL, "Shutdown PHP Module");
+	log_error(LOG_INFORM, "php7_close", NULL, NULL, "Shutdown PHP Module");
 }
 
 /*********************************************************
 / init SAF
 /
-/ Init fn="php5_init" [php_ini="/path/to/php.ini"] [server_lib="ns-httpdXX.dll"]
+/ Init fn="php7_init" [php_ini="/path/to/php.ini"] [server_lib="ns-httpdXX.dll"]
 /   Initialize the NSAPI module in magnus.conf
 /
 / php_ini: gives path to php.ini file
@@ -902,7 +902,7 @@ void NSAPI_PUBLIC php5_close(void *vparam)
 /  servact_* functions
 /
 /*********************************************************/
-int NSAPI_PUBLIC php5_init(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php7_init(pblock *pb, Session *sn, Request *rq)
 {
 	php_core_globals *core_globals;
 	char *strval;
@@ -917,13 +917,13 @@ int NSAPI_PUBLIC php5_init(pblock *pb, Session *sn, Request *rq)
 
 	core_globals = ts_resource(core_globals_id);
 
-	/* look if php_ini parameter is given to php5_init */
+	/* look if php_ini parameter is given to php7_init */
 	if (strval = pblock_findval("php_ini", pb)) {
 		nsapi_sapi_module.php_ini_path_override = strdup(strval);
 	}
 	
 #ifdef PHP_WIN32
-	/* look if server_lib parameter is given to php5_init
+	/* look if server_lib parameter is given to php7_init
 	 * (this disables the automatic search for the newest ns-httpdXX.dll) */
 	if (strval = pblock_findval("server_lib", pb)) {
 		nsapi_dll = strdup(strval);
@@ -934,7 +934,7 @@ int NSAPI_PUBLIC php5_init(pblock *pb, Session *sn, Request *rq)
 	sapi_startup(&nsapi_sapi_module);
 	nsapi_sapi_module.startup(&nsapi_sapi_module);
 
-	daemon_atrestart(&php5_close, NULL);
+	daemon_atrestart(&php7_close, NULL);
 
 	log_error(LOG_INFORM, pblock_findval("fn", pb), sn, rq, "Initialized PHP Module (%d threads expected)", threads);
 	return REQ_PROCEED;
@@ -943,19 +943,19 @@ int NSAPI_PUBLIC php5_init(pblock *pb, Session *sn, Request *rq)
 /*********************************************************
 / normal use in Service directive:
 /
-/ Service fn="php5_execute" type=... method=... [inikey=inivalue inikey=inivalue...]
+/ Service fn="php7_execute" type=... method=... [inikey=inivalue inikey=inivalue...]
 /
 / use in Service for a directory to supply a php-made directory listing instead of server default:
 /
-/ Service fn="php5_execute" type="magnus-internal/directory" script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
+/ Service fn="php7_execute" type="magnus-internal/directory" script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
 /
 / use in Error SAF to display php script as error page:
 /
-/ Error fn="php5_execute" code=XXX script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
-/ Error fn="php5_execute" reason="Reason" script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
+/ Error fn="php7_execute" code=XXX script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
+/ Error fn="php7_execute" reason="Reason" script="/path/to/script.php" [inikey=inivalue inikey=inivalue...]
 /
 /*********************************************************/
-int NSAPI_PUBLIC php5_execute(pblock *pb, Session *sn, Request *rq)
+int NSAPI_PUBLIC php7_execute(pblock *pb, Session *sn, Request *rq)
 {
 	int retval;
 	nsapi_request_context *request_context;
@@ -1076,15 +1076,15 @@ int NSAPI_PUBLIC php5_execute(pblock *pb, Session *sn, Request *rq)
 / will pass authentication through to php, and allow us to
 / check authentication with our scripts.
 /
-/ php5_auth_trans
+/ php7_auth_trans
 /   main function called from netscape server to authenticate
 /   a line in obj.conf:
-/		funcs=php5_auth_trans shlib="path/to/this/phpnsapi.dll"
+/		funcs=php7_auth_trans shlib="path/to/this/phpnsapi.dll"
 /	and:
 /		<Object ppath="path/to/be/authenticated/by/php/*">
-/		AuthTrans fn="php5_auth_trans"
+/		AuthTrans fn="php7_auth_trans"
 /*********************************************************/
-int NSAPI_PUBLIC php5_auth_trans(pblock * pb, Session * sn, Request * rq)
+int NSAPI_PUBLIC php7_auth_trans(pblock * pb, Session * sn, Request * rq)
 {
 	/* This is a DO NOTHING function that allows authentication
 	 * information
diff --git a/sapi/nsapi/php5nsapi.dsp b/sapi/nsapi/php7nsapi.dsp
index 6cd0079b43..04628871fa 100644
--- a/sapi/nsapi/php5nsapi.dsp
+++ b/sapi/nsapi/php7nsapi.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5nsapi" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7nsapi" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5nsapi - Win32 Debug_TS

+CFG=php7nsapi - 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 "php5nsapi.mak".

+!MESSAGE NMAKE /f "php7nsapi.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 "php5nsapi.mak" CFG="php5nsapi - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7nsapi.mak" CFG="php7nsapi - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7nsapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7nsapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7nsapi - 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)" == "php5nsapi - Win32 Release_TS"

+!IF  "$(CFG)" == "php7nsapi - Win32 Release_TS"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5nsapi___Win32_Release_TS"

-# PROP BASE Intermediate_Dir "php5nsapi___Win32_Release_TS"

+# PROP BASE Output_Dir "php7nsapi___Win32_Release_TS"

+# PROP BASE Intermediate_Dir "php7nsapi___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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php7nsapi_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 "php7nsapi_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 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"

+# ADD LINK32 ns-httpd30.lib php7ts.lib kernel32.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)" == "php5nsapi - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7nsapi - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5nsapi___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5nsapi___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7nsapi___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7nsapi___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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php7nsapi_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 "php7nsapi_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 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"

+# ADD LINK32 ns-httpd30.lib php7ts.lib kernel32.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)" == "php5nsapi - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7nsapi - Win32 Debug_TS"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "php5nsapi___Win32_Debug_TS"

-# PROP BASE Intermediate_Dir "php5nsapi___Win32_Debug_TS"

+# PROP BASE Output_Dir "php7nsapi___Win32_Debug_TS"

+# PROP BASE Intermediate_Dir "php7nsapi___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 "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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php7nsapi_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 "php7nsapi_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 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"

+# ADD LINK32 ns-httpd30.lib php7ts_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 "php5nsapi - Win32 Release_TS"

-# Name "php5nsapi - Win32 Release_TS_inline"

-# Name "php5nsapi - Win32 Debug_TS"

+# Name "php7nsapi - Win32 Release_TS"

+# Name "php7nsapi - Win32 Release_TS_inline"

+# Name "php7nsapi - Win32 Debug_TS"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/sapi/phpdbg/phpdbg.1 b/sapi/phpdbg/phpdbg.1
index 5e4d144c83..b6c26df565 100644
--- a/sapi/phpdbg/phpdbg.1
+++ b/sapi/phpdbg/phpdbg.1
@@ -7,7 +7,7 @@ phpdbg \- The interactive PHP debugger
 [\fB\-e\fIFILE\fR]
 .SH DESCRIPTION
 .B phpdbg
-a lightweight, powerful, easy to use debugging platform for PHP5.
+a lightweight, powerful, easy to use debugging platform for PHP7.
 .SH OPTIONS
 The following switches are implemented (just like cli SAPI):
 .TP
diff --git a/sapi/pi3web/README b/sapi/pi3web/README
index e3e523e940..e7726edcf4 100644
--- a/sapi/pi3web/README
+++ b/sapi/pi3web/README
@@ -1,36 +1,36 @@
-PHP5 Module
+PHP7 Module
 ==========
-This module requires PHP5 as thread safe shared library. Have a look
+This module requires PHP7 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 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:
+You should have checked out and built the PHP7 source package from the
+PHP CVS tree into the Pi3Web source directory called 'PHP7' first. Then
+build PHP7 as Pi3Web module and after that build the Pi3Web PHP7 wrapper:
 
-1. Checkout PHP5
+1. Checkout PHP7
 ================
 cvs -d :pserver:cvsread@cvs.php.net:/repository login
 The required password is phpfi
 
-cvs -z3 -d :pserver:cvsread@cvs.php.net:/repository co php5
+cvs -z3 -d :pserver:cvsread@cvs.php.net:/repository co php7
 
 You must also checkout the TSRM and the ZEND module from the ZEND cvs tree
-into the PHP5 root directory
+into the PHP7 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 PHP5 
+2. Build PHP7 
 =============
 2.1 POSIX
 ---------
-cd ./php5
+cd ./php7
 ./buildconf
 ./configure --with-pi3web
 make
@@ -41,10 +41,10 @@ other required downloads from the php website
   - bison 1.25
   - bindlib32
   - number4.tar.gz
-nmake php5dllts.mak
+nmake php7dllts.mak
 
-3. Build Pi3Web PHP5 wrapper
+3. Build Pi3Web PHP7 wrapper
 ============================
-Run make in the Pi3Web /Source/PHP5 directory.
+Run make in the Pi3Web /Source/PHP7 directory.
 
 For further information refer to http://www.php.net/version4/
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 347a74ca06..42ff164394 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_PI3WEB" != "no"; then
   PHP_ADD_INCLUDE($PI3PATH/PiAPI)
   PHP_ADD_INCLUDE($PI3PATH/Pi2API)
   PHP_ADD_INCLUDE($PI3PATH/Pi3API)
-  PHP_ADD_INCLUDE($PI3PATH/PHP5)
+  PHP_ADD_INCLUDE($PI3PATH/PHP7)
   PHP_SELECT_SAPI(pi3web, shared, pi3web_sapi.c)
   INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PI3PATH/bin/"
 fi
diff --git a/sapi/pi3web/config.w32 b/sapi/pi3web/config.w32
index a5393e621b..9441784468 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 PHP5PI3WEB_EXPORTS');
+		SAPI('pi3web', 'pi3web_sapi.c', 'php' + PHP_VERSION + 'pi3web.dll', '/D PHP7PI3WEB_EXPORTS');
 		AC_DEFINE('WITH_PI3WEB', 1);
 	} else {
 		WARNING('Pi3Web not enabled; headers/libraries not found');
diff --git a/sapi/pi3web/php5pi3web.dsp b/sapi/pi3web/php7pi3web.dsp
index bb5a248802..b7f38cecfe 100644
--- a/sapi/pi3web/php5pi3web.dsp
+++ b/sapi/pi3web/php7pi3web.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5pi3web" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7pi3web" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5pi3web - Win32 Debug_TS

+CFG=php7pi3web - 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 "php5pi3web.mak".

+!MESSAGE NMAKE /f "php7pi3web.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 "php5pi3web.mak" CFG="php5pi3web - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7pi3web.mak" CFG="php7pi3web - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7pi3web - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7pi3web - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7pi3web - 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)" == "php5pi3web - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7pi3web - 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 "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" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /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 CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php7pi3web_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP7PI3WEB_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 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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

+# ADD LINK32 php7ts_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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

 

-!ELSEIF  "$(CFG)" == "php5pi3web - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7pi3web - 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 "php5pi3web_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php7pi3web_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP7PI3WEB_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 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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

+# ADD LINK32 php7ts.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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

 

-!ELSEIF  "$(CFG)" == "php5pi3web - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7pi3web - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5pi3web___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5pi3web___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7pi3web___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7pi3web___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 "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" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /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 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 "PHP7DLLTS_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" /I "..\..\..\..\PIAPI" /I "..\..\..\..\PI2API" /I "..\..\..\..\PI3API" /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 "PHP7PI3WEB_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\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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

+# 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\php7ts.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 php7ts.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" /libpath:"..\..\..\..\PIAPI" /libpath:"..\..\..\..\PI2API" /libpath:"..\..\..\..\PI3API"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "php5pi3web - Win32 Debug_TS"

-# Name "php5pi3web - Win32 Release_TS"

-# Name "php5pi3web - Win32 Release_TS_inline"

+# Name "php7pi3web - Win32 Debug_TS"

+# Name "php7pi3web - Win32 Release_TS"

+# Name "php7pi3web - 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 300a722235..d92526cf5e 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -342,7 +342,7 @@ static sapi_module_struct pi3web_sapi_module = {
 	STANDARD_SAPI_MODULE_PROPERTIES
 };
 
-MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB)
+MODULE_API DWORD PHP7_wrapper(LPCONTROL_BLOCK lpCB)
 {
 	zend_file_handle file_handle = {0};
 	int iRet = PIAPI_COMPLETED;
@@ -411,7 +411,7 @@ MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB)
 	return iRet;
 }
 
-MODULE_API BOOL PHP5_startup() {
+MODULE_API BOOL PHP7_startup() {
 	tsrm_startup(1, 1, 0, NULL);
 	sapi_startup(&pi3web_sapi_module);
 	if (pi3web_sapi_module.startup) {
@@ -421,7 +421,7 @@ MODULE_API BOOL PHP5_startup() {
 	return IWasLoaded;
 };
 
-MODULE_API BOOL PHP5_shutdown() {
+MODULE_API BOOL PHP7_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 d229fec53f..83f483d924 100644
--- a/sapi/pi3web/pi3web_sapi.h
+++ b/sapi/pi3web/pi3web_sapi.h
@@ -3,7 +3,7 @@
 
 #ifdef PHP_WIN32
 #	include <windows.h>
-#	ifdef PHP5PI3WEB_EXPORTS
+#	ifdef PHP7PI3WEB_EXPORTS
 #		define MODULE_API __declspec(dllexport) 
 #	else
 #		define MODULE_API __declspec(dllimport) 
@@ -86,9 +86,9 @@ typedef struct _CONTROL_BLOCK {
 
 } CONTROL_BLOCK, *LPCONTROL_BLOCK;
 
-MODULE_API DWORD PHP5_wrapper(LPCONTROL_BLOCK lpCB);
-MODULE_API BOOL PHP5_startup();
-MODULE_API BOOL PHP5_shutdown();
+MODULE_API DWORD PHP7_wrapper(LPCONTROL_BLOCK lpCB);
+MODULE_API BOOL PHP7_startup();
+MODULE_API BOOL PHP7_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 d834a0000e..59c215cba0 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 PHP5
+This solution now works fine and is recommended. Multiple PHP7
 requests will be run in parallell. The maximum number of parallell
-PHP5-execution is limited to the number of handle threads Roxen is
+PHP7-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 248f36f52e..47143f1be1 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/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()
+    /Usr/local/pike/7.0.54/lib/modules/PHP7.so.Interpreter:
+    run("/home/www/www.tx.pl/news/test.php",mapping[3],modules/scripting/php7.pike.PHPScript(),modules/scripting/php7.pike.PHPScript.done)
+    modules/scripting/php7.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/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()
+    callback!/usr/local/pike/7.0.54/lib/modules/PHP7.so.Interpreter:
+    run("/home/www/biall.com.pl/index.php3",mapping[2],modules/scripting/php7.pike.PHPScript(),modules/scripting/php7.pike.PHPScript.done)
+    modules/scripting/php7.pike:169: run()
     base_server/roxen.pike:569: handler_thread(3).
     
 
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 7601b0c1ed..d536ac571b 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -36,7 +36,7 @@ if test "$PHP_ROXEN" != "no"; then
   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/PHP5.so"
+  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PIKE_MODULE_DIR/PHP7.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 46b5002aa4..756f7353e9 100644
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -616,12 +616,12 @@ void f_php_roxen_request_handler(INT32 args)
   TSRMLS_FETCH();
 
   if(current_thread == th_self())
-    php_error(E_WARNING, "PHP5.Interpreter->run: Tried to run a PHP-script from a PHP "
+    php_error(E_WARNING, "PHP7.Interpreter->run: Tried to run a PHP-script from a PHP "
 	  "callback!");
-  get_all_args("PHP5.Interpreter->run", args, "%S%m%O%*", &script,
+  get_all_args("PHP7.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, "PHP5.Interpreter->run: Bad argument 4, expected function.\n");
+    php_error(E_WARNING, "PHP7.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
@@ -657,7 +657,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, "PHP5.Interpreter->run: my_fd object not open or not an FD.\n");
+      php_error(E_WARNING, "PHP7.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 371edaee84..fddb709d92 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -25,10 +25,10 @@ if test "$PHP_THTTPD" != "no"; then
   fi
   PHP_TARGET_RDYNAMIC
   INSTALL_IT="\
-    echo 'PHP_LIBS = -L. -lphp5 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \
+    echo 'PHP_LIBS = -L. -lphp7 \$(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/libphp5.a; \
+    rm -f $THTTPD/php_thttpd.c $THTTPD/php_thttpd.h $THTTPD/libphp7.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 33de921489..c79ee44e62 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) libphp5.a
++thttpd: $(OBJ) libphp7.a
  	@rm -f $@
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(NETLIBS)
  
diff --git a/sapi/tux/README b/sapi/tux/README
index 92c021123f..3c5ebc56ba 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 'php5.tux'.  This will
-       cause requests to '/php5.tux' to be redirected to the
-       userspace module php5.tux.
+    3. Touch a file in your web-root 'php7.tux'.  This will
+       cause requests to '/php7.tux' to be redirected to the
+       userspace module php7.tux.
 
     4. Start TUX with something like
 
-       # tux -d -t 8 -r /www -m /tux-modules php5.tux
+       # tux -d -t 8 -r /www -m /tux-modules php7.tux
       
        (daemon mode, eight threads, web-root /www, modules in
-        /tux-modules, load php5.tux)
+        /tux-modules, load php7.tux)
 
        BEFORE running this command, the kernel side of TUX has to
        be properly setup.
        
     5. Try to access
 
-           http://yourserver/php5.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000
+           http://yourserver/php7.tux?=PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000
 
        It should display the PHP credits page.
 
        To access a script /foo/bar.php, use
 
-           http://yourserver/php5.tux?/foo/bar.php
+           http://yourserver/php7.tux?/foo/bar.php
 
        Parameters can be appended:
        
-           http://yourserver/php5.tux?/foo/bar.php&var=value
+           http://yourserver/php7.tux?/foo/bar.php&var=value
 
diff --git a/sapi/tux/config.m4 b/sapi/tux/config.m4
index 06788be757..db4be82cf1 100644
--- a/sapi/tux/config.m4
+++ b/sapi/tux/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_WITH(tux,,
 
 AC_MSG_CHECKING([for TUX])
 if test "$PHP_TUX" != "no"; then
-  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
+  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php7.tux.so"
   AC_CHECK_HEADERS(tuxmodule.h,[:],[AC_MSG_ERROR([Cannot find tuxmodule.h])])
   PHP_SELECT_SAPI(tux, shared, php_tux.c)
   AC_MSG_RESULT([$PHP_TUX])
diff --git a/sapi/webjames/README b/sapi/webjames/README
index 746a7762fb..15a7be3de0 100644
--- a/sapi/webjames/README
+++ b/sapi/webjames/README
@@ -16,7 +16,7 @@ http://www.webjames.alexwaugh.com/
 
 BUILDING
 
-$ cd php5
+$ cd php7
 $ ./configure \
 	--host=arm-riscos-aof \
 	--with-webjames=../webjames/src \
diff --git a/scripts/dev/credits b/scripts/dev/credits
index 801637cd19..5be84fda07 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 php5/scripts/credits from  
- the information found in the various php5/ext/.../CREDITS and
- php5/sapi/.../CREDITS files 
+ it has been automaticaly created by php7/scripts/credits from  
+ the information found in the various php7/ext/.../CREDITS and
+ php7/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 cca528e29c..0b8cf2650e 100644
--- a/tests/classes/inheritance_002.phpt
+++ b/tests/classes/inheritance_002.phpt
@@ -17,13 +17,13 @@ class Child_php4 extends Base_php4 {
   }
 }
 
-class Base_php5 {
+class Base_php7 {
   function __construct() {
     var_dump('Base constructor');
   }
   }
 
-class Child_php5 extends Base_php5 {
+class Child_php7 extends Base_php7 {
   function __construct() {
     var_dump('Child constructor');
     parent::__construct();
@@ -37,7 +37,7 @@ class Child_mx1 extends Base_php4 {
   }
 }
 
-class Child_mx2 extends Base_php5 {
+class Child_mx2 extends Base_php7 {
   function Child_mx2() {
     var_dump('Child constructor');
     parent::__construct();
@@ -47,8 +47,8 @@ class Child_mx2 extends Base_php5 {
 echo "### PHP 4 style\n";
 $c4= new Child_php4();
 
-echo "### PHP 5 style\n";
-$c5= new Child_php5();
+echo "### PHP 7 style\n";
+$c5= new Child_php7();
 
 echo "### Mixed style 1\n";
 $cm= new Child_mx1();
@@ -60,7 +60,7 @@ $cm= new Child_mx2();
 ### PHP 4 style
 string(17) "Child constructor"
 string(16) "Base constructor"
-### PHP 5 style
+### PHP 7 style
 string(17) "Child constructor"
 string(16) "Base constructor"
 ### Mixed style 1
diff --git a/tests/lang/bug24396.phpt b/tests/lang/bug24396.phpt
index b78e4b8757..80862191de 100644
--- a/tests/lang/bug24396.phpt
+++ b/tests/lang/bug24396.phpt
@@ -6,7 +6,7 @@ Bug #24396 (global $$variable broken)
 $arr = array('a' => 1, 'b' => 2, 'c' => 3);
 
 foreach($arr as $k=>$v)  {
-    global $$k; // comment this out and it works in PHP 5 too..
+    global $$k; // comment this out and it works in PHP 7 too..
                
     echo "($k => $v)\n";
                        
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 84de975e26..b2918b7117 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -62,9 +62,9 @@ Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
 !endif
 
 !if $(PGOMGR) != ""
-PHP5_PGD_OPTION=/PGD:$(PGOPGD_DIR)\php5.pgd
+PHP7_PGD_OPTION=/PGD:$(PGOPGD_DIR)\php7.pgd
 !else
-PHP5_PGD_OPTION=
+PHP7_PGD_OPTION=
 !endif
 
 PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
@@ -89,7 +89,7 @@ $(PHPDLL_RES): win32\build\template.rc
 		win32\build\template.rc
 
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
-	@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP5_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
+	@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP7_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
 	-@$(_VC_MANIFEST_EMBED_DLL)
 
 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
diff --git a/win32/build/block.template.dsw b/win32/build/block.template.dsw
index 2f2682dc71..fd7386e6ab 100644
--- a/win32/build/block.template.dsw
+++ b/win32/build/block.template.dsw
@@ -8,7 +8,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php5ts
+    Project_Dep_Name php7ts
     End Project Dependency
 }}}
 
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 1d488b0798..82378b536d 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -131,7 +131,7 @@ DEFINE('PHP_PREFIX', PHP_PREFIX);
 DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM /I ext ");
 
 // CFLAGS for building the PHP dll
-DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \
+DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP7DLLTS_EXPORTS /D PHP_EXPORTS \
 /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500");
 
 DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index cfec2a28f1..af24193d36 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -115,7 +115,7 @@ DEFINE('PHP_PREFIX', PHP_PREFIX);
 DEFINE("BASE_INCLUDES", "/I " + PHP_DIR + "/include /I " + PHP_DIR + "/include/main /I " + PHP_DIR + "/include/Zend /I " + PHP_DIR + "/include/TSRM /I " + PHP_DIR + "/include/ext ");

 

 // CFLAGS for building the PHP dll

-DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \

+DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP7DLLTS_EXPORTS /D PHP_EXPORTS \

 /D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500");

 

 DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)');

diff --git a/win32/build/projectgen.js b/win32/build/projectgen.js
index 390a303fb4..8adb887786 100644
--- a/win32/build/projectgen.js
+++ b/win32/build/projectgen.js
@@ -142,14 +142,14 @@ function generate_parsers_or_scanners(arr, type)
 	return ret;
 }
 
-/* generate .defs file for php5[ts].dll */
+/* generate .defs file for php7[ts].dll */
 function generate_php_defs()
 {
 	var defs = get_define("PHP_DLL_DEF_SOURCES").split(" ");
 	var bdir = get_define("BUILD_DIR") + "\\";
 	var file = get_define("PHPLIB").replace("lib", "def");
 	var path = "..\\" + bdir + file;
-	var deps = "USERDEP__PHP5TS=";
+	var deps = "USERDEP__PHP7TS=";
 	var cmds = "BuildCmds= \\\r\n";
 	var cmd = '$(SOURCE) "$(INTDIR)" "$(OUTDIR)"\r\n\t$(BuildCmds)\r\n';
 
@@ -168,7 +168,7 @@ function generate_php_defs()
 	return ret;
 }
 
-/* generate win32\wsyslog.h for php5[ts].dll */
+/* generate win32\wsyslog.h for php7[ts].dll */
 function generate_wsyslog()
 {
 	var path = ".\\build\\wsyslog.mc\r\n\r\n";
@@ -183,7 +183,7 @@ function generate_wsyslog()
 	return ret;
 }
 
-/* generate ext\date\lib\timelib_config.h for php5[ts].dll */
+/* generate ext\date\lib\timelib_config.h for php7[ts].dll */
 function generate_timelib_conf(headers)
 {
 	var file = "timelib_config.h";
@@ -202,11 +202,11 @@ function generate_timelib_conf(headers)
 	return headers;
 }
 
-/* generate php5[ts].dsp */
+/* generate php7[ts].dsp */
 function generate_core_dsp(core_headers, core_sources, headers, sources, cflags, ldflags, libs)
 {
 	var ts = (PHP_ZTS != "no" ? "ts" : "");
-	var extname = "php5" + ts;
+	var extname = "php7" + ts;
 	var tmpl = generate_dsp_file(extname, ".", false, false);
 
 	cflags += get_define("CFLAGS_PHP").replace("/D _USRDLL", "");
@@ -232,8 +232,8 @@ function generate_core_dsp(core_headers, core_sources, headers, sources, cflags,
 	defs = generate_php_defs();
 	tmpl = tmpl.replace(/DEFS/, defs);
 
-	dsp = FSO.CreateTextFile("win32\\php5" + ts + ".dsp", true);
-	STDOUT.WriteLine("\tGenerating win32\\php5" + ts + ".dsp");
+	dsp = FSO.CreateTextFile("win32\\php7" + ts + ".dsp", true);
+	STDOUT.WriteLine("\tGenerating win32\\php7" + ts + ".dsp");
 	dsp.Write(tmpl);
 	dsp.Close();
 
@@ -250,8 +250,8 @@ function generate_dsw_files(sblocks, mblocks)
 	/* push all the sapi blocks to the same tag */
 	stmpl = stmpl.replace("INSERT", sblocks);
 	stmpl = (PHP_ZTS != "no" ? stmpl : stmpl.replace(/dllts/g, "dll"));
-	sdsw = FSO.CreateTextFile("win32\\php5" + ts + ".dsw", true);
-	STDOUT.WriteLine("\tGenerating win32\\php5" + ts + ".dsw");
+	sdsw = FSO.CreateTextFile("win32\\php7" + ts + ".dsw", true);
+	STDOUT.WriteLine("\tGenerating win32\\php7" + ts + ".dsw");
 	sdsw.Write(stmpl);
 	sdsw.Close();
 
@@ -345,8 +345,8 @@ function copy_dsp_files()
 
 			} else {
 
-				/* there's always one... most sapis just get a 'php5' prefix */
-				newext = (ext.match(/apache2handler/) ? "php5apache2" : "php5" + ext);
+				/* there's always one... most sapis just get a 'php7' prefix */
+				newext = (ext.match(/apache2handler/) ? "php7apache2" : "php7" + ext);
 				address = address.replace(ext + ".dsp", newext + ".dsp");
 				srcpath = ".\\";
 				oldext = new RegExp(('[^=\\\\]'+ext), "g");
@@ -361,7 +361,7 @@ function copy_dsp_files()
 			dsp.Write(contents);
 			dsp.Close();
 
-			/* add all configured sapis to the list in php5ts.dsw */
+			/* add all configured sapis to the list in php7ts.dsw */
 			sblocks += file_get_contents("win32\\build\\block.template.dsw");
 			sblocks = sblocks.replace("ADDRESS", address);
 			sblocks = sblocks.replace("EXTNAME", newext);
@@ -389,7 +389,7 @@ function copy_dsp_files()
 
 		} else {
 
-			/* bound for php5[ts].dsp */
+			/* bound for php7[ts].dsp */
 			cflags = get_define("CFLAGS_" + EXT);
 			cflags = cflags ? cflags.replace(/-(I|D)/g, " /$1") : "";
 			cflags = cflags? cflags.replace(/\/(I|D)\s+/g, "/$1") : "";
@@ -539,7 +539,7 @@ function generate_dsp_file(ext, ext_dir, files, shared)
 	var baseflags = "";
 
 	/* store the final path and value of shared in the tmp file */
-	if (!ext.match("php5")) {
+	if (!ext.match("php7")) {
 		tmpl = ext_dir + "\\" + ext + ".dsp#" + shared + tmpl;
 	}
 
@@ -568,7 +568,7 @@ function generate_dsp_file(ext, ext_dir, files, shared)
 			path += "..\\";
 		}
 		type = ".lib";
-	} else if (ext.match("php5")) {
+	} else if (ext.match("php7")) {
 		path = "..\\";
 		type = ".dll";
 	} else {
@@ -599,7 +599,7 @@ function generate_dsp_file(ext, ext_dir, files, shared)
 	incs = incs.replace('"' + path + '."', '".."');
 	lcflags = cflags.replace(/\$\(BASE_INCLUDES\)/, incs + (type == ".exe" ? '/I "..\\sapi" ' : "") + '/I "' + path + '..\\bindlib_w32"');
 	tmpl = tmpl.replace(/BASECPP/, (type == ".dll" ? lcflags : lcflags.replace(ld + " ", "")));
-	tmpl = tmpl.replace(/BASELIBS/, "/nologo " + get_define("LIBS") + " " + (ext.match("php5") ? "" : get_define("PHPLIB")));
+	tmpl = tmpl.replace(/BASELIBS/, "/nologo " + get_define("LIBS") + " " + (ext.match("php7") ? "" : get_define("PHPLIB")));
 	ldflags = get_define("LDFLAGS").replace(/\s?(\/nologo|\/libpath:\S+)\s?/g, "");
 	tmpl = tmpl.replace(/BASELDFLAGS/, ldflags + (type == ".dll" ? " " + get_define("DLL_LDFLAGS") : "") + (debug ? ' /nodefaultlib:"msvcrt"' : ""));
 	out = '/out:"' + outpath + "\\" + ext + type + '"' + ' /libpath:"' + outpath + '"' + ' /libpath:"..\\' + path + 'bindlib_w32\\' + status + '"';
@@ -611,7 +611,7 @@ function generate_dsp_file(ext, ext_dir, files, shared)
 	tmpl = tmpl.replace(/TEXTFILES/, txt);
 	tmpl = tmpl.replace(/RESOURCEFILES/, res);
 
-	if (ext.match("php5")) {
+	if (ext.match("php7")) {
 		return tmpl;
 	}
 
diff --git a/win32/build/template.dsw b/win32/build/template.dsw
index ac781664ff..67aa72365b 100644
--- a/win32/build/template.dsw
+++ b/win32/build/template.dsw
@@ -30,7 +30,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "php5ts"=..\win32\php5ts.dsp - Package Owner=<4>
+Project: "php7ts"=..\win32\php7ts.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/win32/build/template.rc b/win32/build/template.rc
index f36f2c041c..b28645822f 100644
--- a/win32/build/template.rc
+++ b/win32/build/template.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 # ifdef FILE_DESCRIPTION
 #define INTERNAL_NAME FILE_DESCRIPTION /* e.g. 'PHP Script Interpreter', 'GD imaging' */
 # else
-#define INTERNAL_NAME FILE_NAME /* e.g. 'php5ts.dll', 'php_bz2.dll' */
+#define INTERNAL_NAME FILE_NAME /* e.g. 'php7ts.dll', 'php_bz2.dll' */
 # endif
 #endif
 
diff --git a/win32/install.txt b/win32/install.txt
index b240ad2723..3c91aeafd7 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -283,7 +283,7 @@ Manual Installation Steps
 
    Extract the distribution file into a directory of your choice. If you
    are installing PHP 4, extract to C:\, as the zip file expands to a
-   foldername like php-4.3.7-Win32. If you are installing PHP 5, extract
+   foldername like php-4.3.7-Win32. If you are installing PHP 7, extract
    to C:\php as the zip file doesn't expand as in PHP 4. You may choose a
    different location but do not have spaces in the path (like C:\Program
    Files\PHP) as some web servers will crash if you do.
@@ -291,12 +291,12 @@ Manual Installation Steps
    The directory structure extracted from the zip is different for PHP
    versions 4 and 5 and look like as follows:
 
-   Example 2-2. PHP 5 package structure
+   Example 2-2. PHP 7 package structure
 c:\php
    |
    +--dev
    |  |
-   |  |-php5ts.lib
+   |  |-php7ts.lib
    |
    +--ext                 -- extension DLLs for PHP
    |  |
@@ -385,7 +385,7 @@ c:\php
    other server modules failing, such as ASP.
 
    The CGI and CLI binaries, and the web server modules all require the
-   php5ts.dll file to be available to them. You have to make
+   php7ts.dll file to be available to them. You have to make
    sure that this file can be found by your PHP installation. The search
    order for this DLL is as follows:
 
@@ -394,7 +394,7 @@ c:\php
        Files\Apache Group\Apache2\bin).
      * Any directory in your Windows PATH environment variable.
 
-   To make php5ts.dll available you have three options: copy
+   To make php7ts.dll available you have three options: copy
    the file to the Windows system directory, copy the file to the web
    server's directory, or add your PHP directory, C:\php to the PATH. For
    better maintenance, we advise you to follow the last option, add C:\php
@@ -463,13 +463,13 @@ ActiveScript
      Note: You should read the manual installation steps first!
 
    After installing PHP, you should download the ActiveScript DLL
-   (php5activescript.dll) and place it in the main PHP folder (e.g.
+   (php7activescript.dll) and place it in the main PHP folder (e.g.
    C:\php).
 
    After having all the files needed, you must register the DLL on your
    system. To achieve this, open a Command Prompt window (located in the
    Start Menu). Then go to your PHP directory by typing something like cd
-   C:\php. To register the DLL just type regsvr32 php5activescript.dll.
+   C:\php. To register the DLL just type regsvr32 php7activescript.dll.
 
    To test if ActiveScript is working, create a new file, named test.wsf
    (the extension is very important) and type:
@@ -516,8 +516,8 @@ General considerations for all installations of PHP with IIS
        Also, CGI users may want to set the cgi.redirect_status_env
        directive. When using directives, be sure these directives aren't
        commented out inside php.ini.
-     * The PHP 4 CGI is named php.exe while in PHP 5 it's php-cgi.exe. In
-       PHP 5, php.exe is the CLI, and not the CGI.
+     * The PHP 4 CGI is named php.exe while in PHP 7 it's php-cgi.exe. In
+       PHP 7, php.exe is the CLI, and not the CGI.
      * Modify the Windows PATH environment variable to include the PHP
        directory. This way the PHP DLL files and PHP executables can all
        remain in the PHP directory without cluttering up the Windows
@@ -529,12 +529,12 @@ General considerations for all installations of PHP with IIS
      * Be sure the extension_dir and doc_root PHP directives are
        appropriately set in php.ini. These directives depend on the system
        that PHP is being installed on. In PHP 4, the extension_dir is
-       extensions while with PHP 5 it's ext. So, an example PHP 5
+       extensions while with PHP 7 it's ext. So, an example PHP 7
        extensions_dir value is "c:\php\ext" and an example IIS doc_root
        value is "c:\Inetpub\wwwroot".
      * PHP extension DLL files, such as php_mysql.dll and php_curl.dll,
        are found in the zip package of the PHP download (not the PHP
-       installer). In PHP 5, many extensions are part of PECL and can be
+       installer). In PHP 7, many extensions are part of PECL and can be
        downloaded in the "Collection of PECL modules" package. Files such
        as php_zip.dll and php_ssh2.dll. Download PHP files here.
      * When defining the executable, the 'check that file exists' box may
@@ -561,7 +561,7 @@ Windows NT/200x/XP and IIS 4 or newer
      * Change the Execute Permissions to 'Scripts only'
      * Click on the 'Configuration' button, and choose the Application
        Mappings tab. Click Add and set the Executable path to the
-       appropriate CGI file. An example PHP 5 value is: C:\php\php-cgi.exe
+       appropriate CGI file. An example PHP 7 value is: C:\php\php-cgi.exe
        Supply .php as the extension. Leave 'Method exclusions' blank, and
        check the 'Script engine' checkbox. Now, click OK a few times.
      * Set up the appropriate security. (This is done in Internet Service
@@ -574,14 +574,14 @@ Windows NT/200x/XP and IIS 4 or newer
      * 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
-       php5isapi.dll.
+       php7isapi.dll.
      * Under 'Home Directory', 'Virtual Directory', or 'Directory', do the
        following:
      * Change the Execute Permissions to 'Scripts only'
      * Click on the 'Configuration' button, and choose the Application
        Mappings tab. Click Add and set the Executable path to the
-       appropriate ISAPI DLL. An example PHP 5 value is:
-       C:\php\php5isapi.dll Supply .php as the extension. Leave 'Method
+       appropriate ISAPI DLL. An example PHP 7 value is:
+       C:\php\php7isapi.dll Supply .php as the extension. Leave 'Method
        exclusions' blank, and check the 'Script engine' checkbox. Now,
        click OK a few times.
      * Stop IIS completely (NET STOP iisadmin)
@@ -590,7 +590,7 @@ Windows NT/200x/XP and IIS 4 or newer
    With IIS 6 (2003 Server), open up the IIS Manager, go to Web Service
    Extensions, choose "Add a new Web service extension", enter in a name
    such as PHP, choose the Add button and for the value browse to either
-   the ISAPI file (php5isapi.dll) or CGI (php.exe or
+   the ISAPI file (php7isapi.dll) or CGI (php.exe or
    php-cgi.exe) then check "Set extension status to Allowed" and click OK.
 
    In order to use index.php as a default content page, do the following:
@@ -653,12 +653,12 @@ Installing as an Apache module
    This assumes PHP is installed to c:\php. Adjust the path if this is not
    the case.
 
-   For PHP 5:
+   For PHP 7:
 # Add to the end of the LoadModule section
-LoadModule php5_module "C:/php/php5apache.dll"
+LoadModule php7_module "C:/php/php7apache.dll"
 
 # Add to the end of the AddModule section
-AddModule mod_php5.c
+AddModule mod_php7.c
 
    For both:
 # Add this line inside the <IfModule mod_mime.c> conditional brace
@@ -681,7 +681,7 @@ AddType application/x-httpd-php .php
 # For PHP 4
 Action application/x-httpd-php "/php/php.exe"
 
-# For PHP 5
+# For PHP 7
 Action application/x-httpd-php "/php/php-cgi.exe"
 
 # specify the directory where php.ini is
@@ -715,7 +715,7 @@ Apache 2.0.x on Microsoft Windows
 
      Apache 2.2.x Support: Users of Apache 2.2.x may use the
      documentation below except the appropriate DLL file is named
-     php5apache2_2.dll and it only exists as of PHP 5.2.0. See also
+     php7apache2_2.dll and it only exists as of PHP 7.2.0. See also
      http://snaps.php.net/
 
    Warning
@@ -734,8 +734,8 @@ Apache 2.0.x on Microsoft Windows
 
      * PHP 4.3.0 or later available at http://www.php.net/downloads.php.
      * the latest stable development version. Get the source code
-       http://snaps.php.net/php5-latest.tar.gz or download binaries for
-       Windows http://snaps.php.net/win32/php5-win32-latest.zip.
+       http://snaps.php.net/php7-latest.tar.gz or download binaries for
+       Windows http://snaps.php.net/win32/php7-win32-latest.zip.
      * a prerelease version downloadable from http://qa.php.net/.
      * you have always the option to obtain PHP through SVN.
 
@@ -782,7 +782,7 @@ AddType application/x-httpd-php .php
 # For PHP 4
 Action application/x-httpd-php "/php/php.exe"
 
-# For PHP 5
+# For PHP 7
 Action application/x-httpd-php "/php/php-cgi.exe"
 
    Warning
@@ -799,8 +799,8 @@ Installing as an Apache module
 
    Example 2-6. PHP and Apache 2.0 as Module
 
-# For PHP 5 do something like this:
-LoadModule php5_module "c:/php/php5apache2.dll"
+# For PHP 7 do something like this:
+LoadModule php7_module "c:/php/php7apache2.dll"
 AddType application/x-httpd-php .php
 
 # configure the path to php.ini
@@ -836,7 +836,7 @@ CGI setup on Sun, iPlanet and Netscape servers
 
    To install PHP as a CGI handler, do the following:
 
-     * Copy php5ts.dll to your systemroot (the directory where you
+     * Copy php7ts.dll to your systemroot (the directory where you
        installed Windows)
      * Make a file association from the command line. Type the following
        two lines:
@@ -861,7 +861,7 @@ NSAPI setup on Sun, iPlanet and Netscape servers
 
    To install PHP with NSAPI, do the following:
 
-     * Copy php5ts.dll to your systemroot (the directory where you
+     * Copy php7ts.dll to your systemroot (the directory where you
        installed Windows)
      * Make a file association from the command line. Type the following
        two lines:
@@ -876,9 +876,9 @@ ftype PHPScript=c:\php\php.exe %1 %*
        and add the following: You should place the lines after mime types
        init.
 
-Init fn="load-modules" funcs="php5_init,php5_execute,php5_auth_trans" shlib="c:/
-php/sapi/php5nsapi.dll"
-Init fn="php5_init" LateInit="yes" errorString="Failed to initialise PHP!" [php_
+Init fn="load-modules" funcs="php7_init,php7_execute,php7_auth_trans" shlib="c:/
+php/sapi/php7nsapi.dll"
+Init fn="php7_init" LateInit="yes" errorString="Failed to initialise PHP!" [php_
 ini="c:/path/to/php.ini"]
 
        The php_ini parameter is optional but with it you
@@ -888,12 +888,12 @@ ini="c:/path/to/php.ini"]
        <Object name="default"> section, place this line necessarily after
        all 'ObjectType' and before all 'AddLog' lines:
 
-Service fn="php5_execute" type="magnus-internal/x-httpd-php" [inikey=value inike
+Service fn="php7_execute" type="magnus-internal/x-httpd-php" [inikey=value inike
 y=value ...]
 
        As additional parameters you can add some special
        php.ini-values, for example you can set a
-       docroot="/path/to/docroot" specific to the context php5_execute is
+       docroot="/path/to/docroot" specific to the context php7_execute is
        called. For boolean ini-keys please use 0/1 as value, not
        "On","Off",... (this will not work correctly), e.g.
        zlib.output_compression=1 instead of zlib.output_compression="On"
@@ -902,7 +902,7 @@ y=value ...]
 
 <Object name="x-httpd-php">
 ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
-Service fn=php5_execute [inikey=value inikey=value ...]
+Service fn=php7_execute [inikey=value inikey=value ...]
 </Object>
 
        After that you can configure a directory in the Administration
@@ -949,7 +949,7 @@ Special use for error pages or self-made directory listings (PHP >= 4.3.3)
    You can use PHP to generate the error pages for "404 Not Found" or
    similar. Add the following line to the object in obj.conf for every
    error page you want to overwrite:
-Error fn="php5_execute" code=XXX script="/path/to/script.php" [inikey=value inik
+Error fn="php7_execute" code=XXX script="/path/to/script.php" [inikey=value inik
 ey=value...]
 
    where XXX is the HTTP error code. Please delete any other Error
@@ -961,7 +961,7 @@ ey=value...]
    create a PHP script which displays a directory listing and replace the
    corresponding default Service line for type="magnus-internal/directory"
    in obj.conf with the following:
-Service fn="php5_execute" type="magnus-internal/directory" script="/path/to/scri
+Service fn="php7_execute" type="magnus-internal/directory" script="/path/to/scri
 pt.php" [inikey=value inikey=value...]
 
    For both error and directory listing pages the original URI and
@@ -986,8 +986,8 @@ Note about nsapi_virtual() and subrequests (PHP >= 4.3.3)
    server is used, the detection fails and nsapi_virtual() is disabled.
 
    If this is the case, try the following: Add the following parameter to
-   php5_init in magnus.conf/obj.conf:
-   Init fn=php5_init ... server_lib="ns-httpdXX.dll"
+   php7_init in magnus.conf/obj.conf:
+   Init fn=php7_init ... server_lib="ns-httpdXX.dll"
 
    where XX is the correct DLL version number. To get it, look in the
    server-root for the correct DLL name. The DLL with the biggest filesize
@@ -1023,7 +1023,7 @@ OmniHTTPd Server
        select Properties
     3. Click on Web Server Global Settings
     4. On the 'External' tab, enter: virtual = .php | actual =
-       c:\php\php.exe (use php-cgi.exe if installing PHP 5), and use the
+       c:\php\php.exe (use php-cgi.exe if installing PHP 7), and use the
        Add button.
     5. On the Mime tab, enter: virtual = wwwserver/stdcgi | actual = .php,
        and use the Add button.
@@ -1080,11 +1080,11 @@ Installation of extensions on Windows
    that require, or used to require, additional PHP DLL files. Here's a
    list of built in extensions:
 
-   In PHP 5 (updated PHP 5.0.4), the following changes exist. Built in:
+   In PHP 7 (updated PHP 5.0.4), the following changes exist. Built in:
    DOM, LibXML, Iconv, SimpleXML, SPL and SQLite. And the following are no
    longer built in: MySQL and Overload.
 
-   The default location PHP searches for extensions is C:\php5 in PHP 5. 
+   The default location PHP searches for extensions is C:\php7 in PHP 7.
    To change this setting to reflect your setup of PHP edit your php.ini
    file:
 
@@ -1446,7 +1446,7 @@ Running PHP as an Apache module
    (e.g. httpd.conf) and .htaccess files. You will need "AllowOverride
    Options" or "AllowOverride All" privileges to do so.
 
-   With PHP 4 and PHP 5, there are several Apache directives that allow
+   With PHP 4 and PHP 7, there are several Apache directives that allow
    you to change the PHP configuration from within the Apache
    configuration files. For a listing of which directives are PHP_INI_ALL,
    PHP_INI_PERDIR, or PHP_INI_SYSTEM, have a look at the List of php.ini
@@ -1481,7 +1481,7 @@ Running PHP as an Apache module
           directives.
 
    Example 5-2. Apache configuration example
-<IfModule mod_php5.c>
+<IfModule mod_php7.c>
   php_value include_path ".:/usr/local/lib/php"
   php_admin_flag engine on
 </IfModule>
@@ -1558,7 +1558,7 @@ Chapter 6. Installation FAQ
    9. Some operating systems: I have installed PHP without errors, but
           when I try to start apache I get undefined symbol errors:
 
-[mybox:user /src/php5] root# apachectl configtest
+[mybox:user /src/php7] root# apachectl configtest
  apachectl: /usr/local/apache/bin/httpd Undefined symbols:
   _compress
   _uncompress
@@ -1769,7 +1769,7 @@ rpm -ivh /usr/src/redhat/RPMS/i386/mod_php3-3.0.5-2.i386.rpm
 
    9. Some operating systems: I have installed PHP without errors, but
    when I try to start apache I get undefined symbol errors:
-[mybox:user /src/php5] root# apachectl configtest
+[mybox:user /src/php7] root# apachectl configtest
  apachectl: /usr/local/apache/bin/httpd Undefined symbols:
   _compress
   _uncompress
@@ -1797,7 +1797,7 @@ cgi error:
    the browser again. If it still fails then it could be one of the
    following:
 
-     * File permissions on your PHP script, php.exe, php5ts.dll, php.ini
+     * File permissions on your PHP script, php.exe, php7ts.dll, php.ini
        or any PHP extensions you are trying to load are such that the
        anonymous internet user ISUR_<machinename> cannot access them.
      * The script file does not exist (or possibly isn't where you think
@@ -1917,8 +1917,8 @@ cgi error:
 AddHandler php-script php
 AddType text/html php
 
-# PHP 5
-AddHandler php5-script php
+# PHP 7
+AddHandler php7-script php
 AddType text/html php
 
    This solution doesn't work for Apache 1 as PHP module doesn't catch
diff --git a/win32/php5.dsp b/win32/php7.dsp
index 0b5b9a6d6b..1550389d98 100644
--- a/win32/php5.dsp
+++ b/win32/php7.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=php5 - Win32 Debug

+CFG=php7 - 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 "php5.mak".

+!MESSAGE NMAKE /f "php7.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 "php5.mak" CFG="php5 - Win32 Debug"

+!MESSAGE NMAKE /f "php7.mak" CFG="php7 - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7 - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7 - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7 - Win32 Release_inline" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -29,7 +29,7 @@ CFG=php5 - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "php5 - Win32 Release"

+!IF  "$(CFG)" == "php7 - 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 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 php7nts.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)" == "php5 - Win32 Debug"

+!ELSEIF  "$(CFG)" == "php7 - 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 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"

+# 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 php7nts_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)" == "php5 - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7 - Win32 Release_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5___Win32_Release_inline"

-# PROP BASE Intermediate_Dir "php5___Win32_Release_inline"

+# PROP BASE Output_Dir "php7___Win32_Release_inline"

+# PROP BASE Intermediate_Dir "php7___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 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"

+# ADD BASE LINK32 php7nts.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 php7nts.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 "php5 - Win32 Release"

-# Name "php5 - Win32 Debug"

-# Name "php5 - Win32 Release_inline"

+# Name "php7 - Win32 Release"

+# Name "php7 - Win32 Debug"

+# Name "php7 - Win32 Release_inline"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".c"

diff --git a/win32/php5.dsw b/win32/php7.dsw
index d6efc98ee2..00e2ded4de 100644
--- a/win32/php5.dsw
+++ b/win32/php7.dsw
@@ -39,7 +39,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php5dll
+    Project_Dep_Name php7dll
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name TSRM
@@ -51,7 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "php5"=.\php5.dsp - Package Owner=<4>
+Project: "php7"=.\php7.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -60,7 +60,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name php5dll
+    Project_Dep_Name php7dll
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name Zend
@@ -72,7 +72,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "php5dll"=.\php5dll.dsp - Package Owner=<4>
+Project: "php7dll"=.\php7dll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/win32/php5dll.dsp b/win32/php7dll.dsp
index cc56f538af..763062219d 100644
--- a/win32/php5dll.dsp
+++ b/win32/php7dll.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="php5dll" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7dll" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5dll - Win32 Debug

+CFG=php7dll - 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 "php5dll.mak".

+!MESSAGE NMAKE /f "php7dll.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 "php5dll.mak" CFG="php5dll - Win32 Debug"

+!MESSAGE NMAKE /f "php7dll.mak" CFG="php7dll - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7dll - 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)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - 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 "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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLLTS_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\php5nts_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\php7nts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug" /libpath:"..\Zend\Debug" /libpath:"..\..\bindlib_w32\Debug"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLL_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\php5nts.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\php7nts.dll" /libpath:"..\Zend\Release" /libpath:"..\TSRM\Release_TS" /libpath:"..\..\bindlib_w32\Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5dll___Win32_Release_inline"

-# PROP BASE Intermediate_Dir "php5dll___Win32_Release_inline"

+# PROP BASE Output_Dir "php7dll___Win32_Release_inline"

+# PROP BASE Intermediate_Dir "php7dll___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 "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 CPP /nologo /MD /W3 /GX /O2 /I "Zend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLLTS_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/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"

+# 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/php7nts.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\php7nts.dll" /libpath:"..\Zend\Release_inline" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "php5dll - Win32 Debug"

-# Name "php5dll - Win32 Release"

-# Name "php5dll - Win32 Release_inline"

+# Name "php7dll - Win32 Debug"

+# Name "php7dll - Win32 Release"

+# Name "php7dll - Win32 Release_inline"

 # Begin Group "Core"

 

 # PROP Default_Filter ""

@@ -498,13 +498,13 @@ SOURCE=..\ext\odbc\php_odbc.c
 

 SOURCE=..\ext\pcre\php_pcre.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -746,13 +746,13 @@ SOURCE=..\regex\regfree.c
 

 SOURCE=..\ext\pcre\pcrelib\chartables.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -761,13 +761,13 @@ SOURCE=..\ext\pcre\pcrelib\chartables.c
 

 SOURCE=..\ext\pcre\pcrelib\get.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -776,13 +776,13 @@ SOURCE=..\ext\pcre\pcrelib\get.c
 

 SOURCE=..\ext\pcre\pcrelib\maketables.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -791,13 +791,13 @@ SOURCE=..\ext\pcre\pcrelib\maketables.c
 

 SOURCE=..\ext\pcre\pcrelib\pcre.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -806,13 +806,13 @@ SOURCE=..\ext\pcre\pcrelib\pcre.c
 

 SOURCE=..\ext\pcre\pcrelib\study.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # ADD CPP /D "STATIC"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 !ENDIF 

 

@@ -962,17 +962,17 @@ SOURCE=..\ext\calendar\sdncal.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\add.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -984,17 +984,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\compare.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1006,17 +1006,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\debug.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1028,17 +1028,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\div.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1050,17 +1050,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\divmod.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1072,17 +1072,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1094,17 +1094,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\init.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1116,17 +1116,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\int2num.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1138,17 +1138,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1160,17 +1160,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\neg.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1182,17 +1182,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\num2long.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1204,17 +1204,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\num2str.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1226,17 +1226,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1248,17 +1248,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\output.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1270,17 +1270,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\raise.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1292,17 +1292,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1314,17 +1314,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\recmul.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1336,17 +1336,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1358,17 +1358,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\rt.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1380,17 +1380,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1402,17 +1402,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\str2num.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1424,17 +1424,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\sub.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1446,17 +1446,17 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\zero.c

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

@@ -1472,11 +1472,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 

@@ -1487,11 +1487,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\config.h

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 

@@ -1502,11 +1502,11 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\private.h

 

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

+!IF  "$(CFG)" == "php7dll - Win32 Debug"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

+!ELSEIF  "$(CFG)" == "php7dll - Win32 Release_inline"

 

 # PROP Intermediate_Dir "..\Release_inline_bcmath"

 

diff --git a/win32/php5dllts.dsp b/win32/php7dllts.dsp
index 3755ea79f9..423ff6ff9f 100644
--- a/win32/php5dllts.dsp
+++ b/win32/php7dllts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php5dllts" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7dllts" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=php5dllts - Win32 Debug_TS

+CFG=php7dllts - 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 "php5dllts.mak".

+!MESSAGE NMAKE /f "php7dllts.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 "php5dllts.mak" CFG="php5dllts - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7dllts.mak" CFG="php7dllts - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "php7dllts - 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)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - 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 "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 CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLLTS_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\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"

+# 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\php7ts_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)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - 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 "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 CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLLTS_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\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"

+# 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\php7ts.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)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5dllts___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7dllts___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7dllts___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 "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 CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP7DLLTS_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 "PHP7DLLTS_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/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"

+# 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/php7ts.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\php7ts.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)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5dllts___Win32_Release_TSDbg"

-# PROP BASE Intermediate_Dir "php5dllts___Win32_Release_TSDbg"

+# PROP BASE Output_Dir "php7dllts___Win32_Release_TSDbg"

+# PROP BASE Intermediate_Dir "php7dllts___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 "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 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 "PHP7DLLTS_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 "PHP7DLLTS_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\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"

+# 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\php7ts.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\php7ts.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 "php5dllts - Win32 Debug_TS"

-# Name "php5dllts - Win32 Release_TS"

-# Name "php5dllts - Win32 Release_TS_inline"

-# Name "php5dllts - Win32 Release_TSDbg"

+# Name "php7dllts - Win32 Debug_TS"

+# Name "php7dllts - Win32 Release_TS"

+# Name "php7dllts - Win32 Release_TS_inline"

+# Name "php7dllts - Win32 Release_TSDbg"

 # Begin Group "Core"

 

 # PROP Default_Filter ""

@@ -987,22 +987,22 @@ SOURCE=..\ext\iconv\php_iconv.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\add.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1016,22 +1016,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\add.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\compare.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1045,22 +1045,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\compare.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\debug.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1074,22 +1074,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\debug.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\div.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1103,22 +1103,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\div.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\divmod.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1132,22 +1132,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\divmod.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1161,22 +1161,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\doaddsub.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\init.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1190,22 +1190,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\init.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\int2num.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1219,22 +1219,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\int2num.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1248,22 +1248,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\nearzero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\neg.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1277,22 +1277,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\neg.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\num2long.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1306,22 +1306,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2long.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\num2str.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1335,22 +1335,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\num2str.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1364,22 +1364,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\outofmem.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\output.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1393,22 +1393,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\output.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\raise.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1422,22 +1422,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raise.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1451,22 +1451,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\raisemod.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\recmul.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1480,22 +1480,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\recmul.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1509,22 +1509,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rmzero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\rt.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1538,22 +1538,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\rt.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1567,22 +1567,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sqrt.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\str2num.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1596,22 +1596,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\str2num.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\sub.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1625,22 +1625,22 @@ SOURCE=..\ext\bcmath\libbcmath\src\sub.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\zero.c

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 # ADD CPP /I "..\ext\bcmath\libbcmath\src"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1658,19 +1658,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\zero.c
 

 SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1682,19 +1682,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\bcmath.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\config.h

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -1706,19 +1706,19 @@ SOURCE=..\ext\bcmath\libbcmath\src\config.h
 

 SOURCE=..\ext\bcmath\libbcmath\src\private.h

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # PROP BASE Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

 # PROP Intermediate_Dir "ext\bcmath\libbcmath\Release_TS"

@@ -2265,7 +2265,7 @@ SOURCE=..\ext\date\lib\timelib.c
 

 SOURCE=..\ext\date\lib\timelib_config.h.win32

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 # Begin Custom Build

 InputDir=\Projects\php-5.2\ext\date\lib

@@ -2276,7 +2276,7 @@ InputPath=..\ext\date\lib\timelib_config.h.win32
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 # Begin Custom Build

 InputDir=\Projects\php-5.2\ext\date\lib

@@ -2287,7 +2287,7 @@ InputPath=..\ext\date\lib\timelib_config.h.win32
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 # Begin Custom Build

 InputDir=\Projects\php-5.2\ext\date\lib

@@ -2298,7 +2298,7 @@ InputPath=..\ext\date\lib\timelib_config.h.win32
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # Begin Custom Build

 InputDir=\Projects\php-5.2\ext\date\lib

@@ -2401,13 +2401,13 @@ SOURCE=..\win32\wsyslog.c
 

 SOURCE=.\build\wsyslog.mc

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 # Begin Custom Build

 InputDir=.\build

@@ -2658,17 +2658,17 @@ SOURCE=..\ext\com_dotnet\com_variant.c
 # End Group

 # Begin Source File

 

-SOURCE=.\php5dllts.rc

+SOURCE=.\php7dllts.rc

 # End Source File

 # Begin Source File

 

-SOURCE=.\php5dllts.rc2

+SOURCE=.\php7dllts.rc2

 # End Source File

 # Begin Source File

 

 SOURCE=.\phpts.def

 

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

+!IF  "$(CFG)" == "php7dllts - Win32 Debug_TS"

 

 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	"..\ext\libxml\php_libxml2.def"	

 # Begin Custom Build - Generating $(InputPath)

@@ -2679,7 +2679,7 @@ InputPath=.\phpts.def
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS"

 

 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	"..\ext\libxml\php_libxml2.def"	

 # Begin Custom Build - Generating $(InputPath)

@@ -2690,7 +2690,7 @@ InputPath=.\phpts.def
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TS_inline"

 

 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	"..\ext\libxml\php_libxml2.def"	

 # Begin Custom Build - Generating $(InputPath)

@@ -2701,7 +2701,7 @@ InputPath=.\phpts.def
 

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7dllts - Win32 Release_TSDbg"

 

 USERDEP__PHPTS="..\ext\sqlite\php_sqlite.def"	"..\ext\libxml\php_libxml2.def"	

 # Begin Custom Build - Generating $(InputPath)

diff --git a/win32/php5dllts.rc b/win32/php7dllts.rc
index 2e01037eee..27ec635e25 100644
--- a/win32/php5dllts.rc
+++ b/win32/php7dllts.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php5dllts.rc2""\r\n"
+    "#include ""php7dllts.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php5dllts.rc2"
+#include "php7dllts.rc2"
 
 
 
diff --git a/win32/php5dllts.rc2 b/win32/php7dllts.rc2
index b05f0af0dc..6bcc652a72 100644
--- a/win32/php5dllts.rc2
+++ b/win32/php7dllts.rc2
@@ -1,5 +1,5 @@
 //
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php7dllts.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-2007 The PHP Group\0"
             VALUE "LegalTrademarks", "php\0"
-            VALUE "OriginalFilename", "php5ts.dll\0"
+            VALUE "OriginalFilename", "php7ts.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/php5ts.dsp b/win32/php7ts.dsp
index 3736815127..101d500dcd 100644
--- a/win32/php5ts.dsp
+++ b/win32/php7ts.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php5ts" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7ts" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=php5ts - Win32 Debug_TS

+CFG=php7ts - 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 "php5ts.mak".

+!MESSAGE NMAKE /f "php7ts.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 "php5ts.mak" CFG="php5ts - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7ts.mak" CFG="php7ts - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7ts - Win32 Release_TS" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts - Win32 Debug_TS" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -30,7 +30,7 @@ CFG=php5ts - Win32 Debug_TS
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "php5ts - Win32 Release_TS"

+!IF  "$(CFG)" == "php7ts - 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 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"

+# ADD LINK32 php7ts.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)" == "php5ts - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7ts - 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 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"

+# 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 php7ts_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)" == "php5ts - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7ts - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7ts___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7ts___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 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"

+# ADD BASE LINK32 php7ts.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 php7ts.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)" == "php5ts - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7ts - Win32 Release_TSDbg"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"

-# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"

+# PROP BASE Output_Dir "php7ts___Win32_Release_TSDbg"

+# PROP BASE Intermediate_Dir "php7ts___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 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"

+# ADD BASE LINK32 php7ts.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 php7ts.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 "php5ts - Win32 Release_TS"

-# Name "php5ts - Win32 Debug_TS"

-# Name "php5ts - Win32 Release_TS_inline"

-# Name "php5ts - Win32 Release_TSDbg"

+# Name "php7ts - Win32 Release_TS"

+# Name "php7ts - Win32 Debug_TS"

+# Name "php7ts - Win32 Release_TS_inline"

+# Name "php7ts - Win32 Release_TSDbg"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".c"

@@ -181,11 +181,11 @@ SOURCE=..\sapi\cgi\libfcgi\os_win32.c
 # End Group

 # Begin Source File

 

-SOURCE=.\php5ts.rc

+SOURCE=.\php7ts.rc

 # End Source File

 # Begin Source File

 

-SOURCE=.\php5ts.rc2

+SOURCE=.\php7ts.rc2

 # End Source File

 # End Target

 # End Project

diff --git a/win32/php5ts.dsw b/win32/php7ts.dsw
index 61ccd1c24b..7e60b38135 100644
--- a/win32/php5ts.dsw
+++ b/win32/php7ts.dsw
@@ -57,7 +57,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php5aolserver"=..\sapi\aolserver\php5aolserver.dsp - Package Owner=<4>

+Project: "php7aolserver"=..\sapi\aolserver\php7aolserver.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -66,13 +66,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5apache"=..\sapi\apache\php5apache.dsp - Package Owner=<4>

+Project: "php7apache"=..\sapi\apache\php7apache.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -81,13 +81,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5apache2"=..\SAPI\APACHE2HANDLER\php5apache2.dsp - Package Owner=<4>

+Project: "php7apache2"=..\SAPI\APACHE2HANDLER\php7apache2.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -96,13 +96,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5dllts"=.\php5dllts.dsp - Package Owner=<4>

+Project: "php7dllts"=.\php7dllts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,7 +123,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "php5isapi"=..\sapi\isapi\php5isapi.dsp - Package Owner=<4>

+Project: "php7isapi"=..\sapi\isapi\php7isapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -132,13 +132,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5nsapi"=..\sapi\nsapi\php5nsapi.dsp - Package Owner=<4>

+Project: "php7nsapi"=..\sapi\nsapi\php7nsapi.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -147,13 +147,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5pi3web"=..\sapi\pi3web\php5pi3web.dsp - Package Owner=<4>

+Project: "php7pi3web"=..\sapi\pi3web\php7pi3web.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -162,13 +162,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5ts"=.\php5ts.dsp - Package Owner=<4>

+Project: "php7ts"=.\php7ts.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -177,13 +177,13 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "php5ts_cli"=.\php5ts_cli.dsp - Package Owner=<4>

+Project: "php7ts_cli"=.\php7ts_cli.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -192,7 +192,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5dllts

+    Project_Dep_Name php7dllts

     End Project Dependency

 }}}

 

@@ -207,7 +207,7 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name php5ts

+    Project_Dep_Name php7ts

     End Project Dependency

 }}}

 

diff --git a/win32/php5ts.rc b/win32/php7ts.rc
index d9a4aa541b..b725155809 100644
--- a/win32/php5ts.rc
+++ b/win32/php7ts.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php5ts.rc2""\r\n"
+    "#include ""php7ts.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php5ts.rc2"
+#include "php7ts.rc2"
 
 
 
diff --git a/win32/php5ts.rc2 b/win32/php7ts.rc2
index 3a53a900ec..6c813de23c 100644
--- a/win32/php5ts.rc2
+++ b/win32/php7ts.rc2
@@ -1,5 +1,5 @@
 //
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php7dllts.RC2 - resources Microsoft Visual C++ does not edit directly
 //
 
 #ifdef APSTUDIO_INVOKED
diff --git a/win32/php5ts_cli.dsp b/win32/php7ts_cli.dsp
index 37a4113ad4..1fee958b06 100644
--- a/win32/php5ts_cli.dsp
+++ b/win32/php7ts_cli.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="php5ts_cli" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="php7ts_cli" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=php5ts_cli - Win32 Debug_TS

+CFG=php7ts_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 "php5ts_cli.mak".

+!MESSAGE NMAKE /f "php7ts_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 "php5ts_cli.mak" CFG="php5ts_cli - Win32 Debug_TS"

+!MESSAGE NMAKE /f "php7ts_cli.mak" CFG="php7ts_cli - Win32 Debug_TS"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!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 "php7ts_cli - Win32 Release_TS" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts_cli - Win32 Debug_TS" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts_cli - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")

+!MESSAGE "php7ts_cli - Win32 Release_TSDbg" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -30,7 +30,7 @@ CFG=php5ts_cli - Win32 Debug_TS
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "php5ts_cli - Win32 Release_TS"

+!IF  "$(CFG)" == "php7ts_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 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"

+# ADD LINK32 php7ts.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)" == "php5ts_cli - Win32 Debug_TS"

+!ELSEIF  "$(CFG)" == "php7ts_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 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"

+# 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 php7ts_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)" == "php5ts_cli - Win32 Release_TS_inline"

+!ELSEIF  "$(CFG)" == "php7ts_cli - Win32 Release_TS_inline"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5ts___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TS_inline"

+# PROP BASE Output_Dir "php7ts___Win32_Release_TS_inline"

+# PROP BASE Intermediate_Dir "php7ts___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 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"

+# ADD BASE LINK32 php7ts.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 php7ts.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)" == "php5ts_cli - Win32 Release_TSDbg"

+!ELSEIF  "$(CFG)" == "php7ts_cli - Win32 Release_TSDbg"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php5ts___Win32_Release_TSDbg"

-# PROP BASE Intermediate_Dir "php5ts___Win32_Release_TSDbg"

+# PROP BASE Output_Dir "php7ts___Win32_Release_TSDbg"

+# PROP BASE Intermediate_Dir "php7ts___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 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"

+# ADD BASE LINK32 php7ts.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 php7ts.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 "php5ts_cli - Win32 Release_TS"

-# Name "php5ts_cli - Win32 Debug_TS"

-# Name "php5ts_cli - Win32 Release_TS_inline"

-# Name "php5ts_cli - Win32 Release_TSDbg"

+# Name "php7ts_cli - Win32 Release_TS"

+# Name "php7ts_cli - Win32 Debug_TS"

+# Name "php7ts_cli - Win32 Release_TS_inline"

+# Name "php7ts_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=.\php5ts_cli.rc

+SOURCE=.\php7ts_cli.rc

 # End Source File

 # Begin Source File

 

-SOURCE=.\php5ts_cli.rc2

+SOURCE=.\php7ts_cli.rc2

 # End Source File

 # End Target

 # End Project

diff --git a/win32/php5ts_cli.rc b/win32/php7ts_cli.rc
index 0053e0c7f2..3478b94bd7 100644
--- a/win32/php5ts_cli.rc
+++ b/win32/php7ts_cli.rc
@@ -70,7 +70,7 @@ END
 
 BEGIN
 
-    "#include ""php5ts_cli.rc2""\r\n"
+    "#include ""php7ts_cli.rc2""\r\n"
 
     "\0"
 
@@ -114,7 +114,7 @@ END
 
 //
 
-#include "php5ts_cli.rc2"
+#include "php7ts_cli.rc2"
 
 
 
diff --git a/win32/php5ts_cli.rc2 b/win32/php7ts_cli.rc2
index 517bd4ab34..004808c16b 100644
--- a/win32/php5ts_cli.rc2
+++ b/win32/php7ts_cli.rc2
@@ -1,5 +1,5 @@
 //
-// php5dllts.RC2 - resources Microsoft Visual C++ does not edit directly
+// php7dllts.RC2 - resources Microsoft Visual C++ does not edit directly
 //
 
 #ifdef APSTUDIO_INVOKED
diff --git a/win32/resource.h b/win32/resource.h
index 3e7e4c0ed1..13760d4962 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by php5dllts.rc
+// Used by php7dllts.rc
 //
 
 // Next default values for new objects
diff --git a/win32/syslog.reg b/win32/syslog.reg
index cb12d6e6b9..2974bfbd48 100644
--- a/win32/syslog.reg
+++ b/win32/syslog.reg
@@ -2,4 +2,4 @@ REGEDIT4
 

 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PHP-5.3.99-dev]

 "TypesSupported"=dword:00000007

-"EventMessageFile"="g:\\test\\srctrunkinstall\\php5ts.dll"

+"EventMessageFile"="g:\\test\\srctrunkinstall\\php7ts.dll"