New upstream version 5.5.2+dfsgupstream/5.5.2+dfsg

15 files changed, 23 insertions, 22 deletions

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index af83e9bcf..7b0ee562e 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -20,7 +20,7 @@ fi
 
 dnl Apache 1.x shared module
 PHP_ARG_WITH(apxs,,
-[  --with-apxs[=FILE]      Build shared Apache 1.x module. FILE is the optional
+[  --with-apxs[=FILE]        Build shared Apache 1.x module. FILE is the optional
                           pathname to the Apache apxs tool [apxs]], no, no)
 
 AC_MSG_CHECKING([for Apache 1.x module support via DSO through APXS])
@@ -59,7 +59,7 @@ if test "$PHP_APXS" != "no"; then
   # Test that we're trying to configure with apache 1.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -ge 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2]) 
+    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2]) 
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -123,7 +123,7 @@ fi
 
 dnl Apache 1.x static module
 PHP_ARG_WITH(apache,,
-[  --with-apache[=DIR]     Build Apache 1.x module. DIR is the top-level Apache
+[  --with-apache[=DIR]       Build Apache 1.x module. DIR is the top-level Apache
                           build directory [/usr/local/apache]], no, no)
 
 AC_MSG_CHECKING([for Apache 1.x module support])
@@ -237,7 +237,7 @@ if test -z "$enable_mod_charset" && test "$with_mod_charset"; then
 fi
   
 PHP_ARG_ENABLE(mod-charset, whether to enable Apache charset compatibility option,
-[  --enable-mod-charset      APACHE: Enable transfer tables for mod_charset (Rus Apache)], no, no)
+[  --enable-mod-charset    APACHE: Enable transfer tables for mod_charset (Rus Apache)], no, no)
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
   AC_DEFINE(USE_TRANSFER_TABLES, 1, [ ])
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index c49488d18..b6524fd87 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -62,7 +62,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -le 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)])
+    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
   elif test "$APACHE_VERSION" -lt 2000040; then
     AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required])
   fi
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 702f91f5d..02f8a0b3a 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(apxs2,,
-[  --with-apxs2[=FILE]     Build shared Apache 2.0 Handler module. FILE is the optional
+[  --with-apxs2[=FILE]       Build shared Apache 2.0 Handler module. FILE is the optional
                           pathname to the Apache apxs tool [apxs]], no, no)
 
 AC_MSG_CHECKING([for Apache 2.0 handler-module support via DSO through APXS])
@@ -61,7 +61,7 @@ if test "$PHP_APXS2" != "no"; then
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -le 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)])
+    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
   elif test "$APACHE_VERSION" -lt 2000044; then
     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
   fi
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 4213b7c6a..e2c71b427 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -60,7 +60,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
   # Test that we're trying to configure with apache 1.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -ge 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2]) 
+    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2]) 
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -239,7 +239,7 @@ if test -z "$enable_mod_charset" && test "$with_mod_charset"; then
 fi
 
 PHP_ARG_ENABLE(mod-charset, whether to enable Apache charset compatibility option,
-[  --enable-mod-charset      APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)], no, no)
+[  --enable-mod-charset    APACHE (hooks): Enable transfer tables for mod_charset (Rus Apache)], no, no)
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
   AC_DEFINE(USE_TRANSFER_TABLES, 1, [ ])
diff --git a/sapi/caudium/config.m4 b/sapi/caudium/config.m4
index 8aba33e23..5ce55f3f0 100644
--- a/sapi/caudium/config.m4
+++ b/sapi/caudium/config.m4
@@ -4,7 +4,7 @@ dnl
 
 RESULT=no
 PHP_ARG_WITH(caudium,,
-[  --with-caudium[=DIR]    Build PHP as a Pike module for use with Caudium.
+[  --with-caudium[=DIR]      Build PHP as a Pike module for use with Caudium.
                           DIR is the Caudium server dir [/usr/local/caudium/server]], no, no)
 
 AC_MSG_CHECKING([for Caudium support])
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index d54dd4080..d3d7cb355 100644
--- a/sapi/cgi/Makefile.frag
+++ b/sapi/cgi/Makefile.frag
@@ -5,6 +5,7 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
 
 install-cgi: $(SAPI_CGI_PATH)
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
 	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index a1bae67e7..cbe9c7bd6 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1335,7 +1335,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
 	static const char *index_files[] = { "index.php", "index.html", NULL };
 	char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1);
 	char *p = buf, *prev_path = NULL, *q, *vpath;
-	size_t prev_path_len;
+	size_t prev_path_len = 0;
 	int  is_static_file = 0;
 
 	if (!buf) {
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4
index 3a61b458f..5ffb9b39b 100644
--- a/sapi/embed/config.m4
+++ b/sapi/embed/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_ENABLE(embed,,
-[  --enable-embed[=TYPE]   EXPERIMENTAL: Enable building of embedded SAPI library
+[  --enable-embed[=TYPE]     EXPERIMENTAL: Enable building of embedded SAPI library
                           TYPE is either 'shared' or 'static'. [TYPE=shared]], no, no)
 
 AC_MSG_CHECKING([for embedded SAPI library support])
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 3d34c7958..bd6d64930 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_ENABLE(fpm,,
-[  --enable-fpm              Enable building of the fpm SAPI executable], no, no)
+[  --enable-fpm            Enable building of the fpm SAPI executable], no, no)
 
 dnl configure checks {{{
 AC_DEFUN([AC_FPM_STDLIBS],
@@ -557,11 +557,11 @@ if test "$PHP_FPM" != "no"; then
 	AC_FPM_SELECT
 
   PHP_ARG_WITH(fpm-user,,
-  [  --with-fpm-user[=USER]  Set the user for php-fpm to run as. (default: nobody)], nobody, no)
+  [  --with-fpm-user[=USER]    Set the user for php-fpm to run as. (default: nobody)], nobody, no)
 
   PHP_ARG_WITH(fpm-group,,
-  [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
-                  should usually be set to match the fpm username (default: nobody)], nobody, no)
+  [  --with-fpm-group[=GRP]    Set the group for php-fpm to run as. For a system user, this 
+                          should usually be set to match the fpm username (default: nobody)], nobody, no)
 
   PHP_ARG_WITH(fpm-systemd,,
   [  --with-fpm-systemd      Activate systemd integration], no, no)
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
index cf3f098c5..99905c8b6 100644
--- a/sapi/fpm/fpm/fastcgi.c
+++ b/sapi/fpm/fpm/fastcgi.c
@@ -610,7 +610,7 @@ static int fcgi_read_request(fcgi_request *req)
 		}
 
 		zend_hash_internal_pointer_reset_ex(req->env, &pos);
-		while ((key_type = zend_hash_get_current_key_ex(req->env, &str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
+		while ((key_type = zend_hash_get_current_key_ex(req->env, &str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTENT) {
 			int zlen;
 			zend_hash_move_forward_ex(req->env, &pos);
 			if (key_type != HASH_KEY_IS_STRING) {
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6912477b8..af4f2fa32 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -401,7 +401,7 @@ pm.max_spare_servers = 3
 ;      - %{megabytes}M
 ;      - %{mega}M
 ;  %n: pool name
-;  %o: ouput header
+;  %o: output header
 ;      it must be associated with embraces to specify the name of the header:
 ;      - %{Content-Type}o
 ;      - %{X-Powered-By}o
diff --git a/sapi/isapi/config.m4 b/sapi/isapi/config.m4
index 7c7dcf0c2..6014bab09 100644
--- a/sapi/isapi/config.m4
+++ b/sapi/isapi/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(isapi, for Zeus ISAPI support,
-[  --with-isapi[=DIR]      Build PHP as an ISAPI module for use with Zeus], no, no)
+[  --with-isapi[=DIR]        Build PHP as an ISAPI module for use with Zeus], no, no)
 
 if test "$PHP_ISAPI" != "no"; then
   if test "$PHP_ISAPI" = "yes"; then
diff --git a/sapi/milter/config.m4 b/sapi/milter/config.m4
index 48c7a5d80..4bcad80bb 100644
--- a/sapi/milter/config.m4
+++ b/sapi/milter/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(milter, for Milter support,
-[  --with-milter[=DIR]     Build PHP as Milter application], no, no)
+[  --with-milter[=DIR]       Build PHP as Milter application], no, no)
 
 if test "$PHP_MILTER" != "no"; then
   if test "$PHP_MILTER" = "yes"; then
diff --git a/sapi/pi3web/config.m4 b/sapi/pi3web/config.m4
index 785948150..347a74ca0 100644
--- a/sapi/pi3web/config.m4
+++ b/sapi/pi3web/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(pi3web, for Pi3Web support,
-[  --with-pi3web[=DIR]     Build PHP as Pi3Web module], no, no)
+[  --with-pi3web[=DIR]       Build PHP as Pi3Web module], no, no)
 
 if test "$PHP_PI3WEB" != "no"; then
   if test "$PHP_PI3WEB" = "yes"; then
diff --git a/sapi/roxen/config.m4 b/sapi/roxen/config.m4
index 9b0bb90c3..7601b0c1e 100644
--- a/sapi/roxen/config.m4
+++ b/sapi/roxen/config.m4
@@ -7,7 +7,7 @@ PHP_ARG_WITH(roxen,,
                           directory, normally /usr/local/roxen/server], no, no)
 
 PHP_ARG_ENABLE(roxen-zts, whether Roxen module is build using ZTS,
-[  --enable-roxen-zts        ROXEN: Build the Roxen module using Zend Thread Safety], no, no)
+[  --enable-roxen-zts      ROXEN: Build the Roxen module using Zend Thread Safety], no, no)
 
 RESULT=
 AC_MSG_CHECKING([for Roxen/Pike support])