Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Happy new year (Update copyright to 2018)
  Happy new year (Update copyright to 2018)
  Revert "Enable ODBC tests on AppVeyor"
  Enable ODBC tests on AppVeyor
  Skip on Travis-CI
  Extend skip section
  2018
  missing changelog entries + fix version and date
  missing changelog entries
  2018
  Trailing whitespaces

13 files changed, 203 insertions, 203 deletions

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 0fbacdc96e..f8c677bd50 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -2166,8 +2166,8 @@ consult the installation file that came with this distribution, or visit \n\
 			int i;
 
 			ZeroMemory(&kid_cgi_ps, sizeof(kid_cgi_ps));
-			kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN; 
-			
+			kids = children < WIN32_MAX_SPAWN_CHILDREN ? children : WIN32_MAX_SPAWN_CHILDREN;
+
 			SetConsoleCtrlHandler(fastcgi_cleanup, TRUE);
 
 			/* kids will inherit the env, don't let them spawn */
@@ -2264,10 +2264,10 @@ consult the installation file that came with this distribution, or visit \n\
 						fprintf(stderr, "unable to spawn: [0x%08lx]: %s\n", err, err_text);
 					}
 				}
-				
+
 				WaitForMultipleObjects(kids, kid_cgi_ps, FALSE, INFINITE);
 			}
-			
+
 			/* restore my env */
 			SetEnvironmentVariable("PHP_FCGI_CHILDREN", kid_buf);
 
@@ -2748,7 +2748,7 @@ fastcgi_request_done:
 			}
 			/* end of fastcgi loop */
 		}
-		
+
 		if (request) {
 			fcgi_destroy_request(request);
 		}
diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c
index b5d642f8a6..26583881af 100644
--- a/sapi/fpm/fpm/fpm_php_trace.c
+++ b/sapi/fpm/fpm/fpm_php_trace.c
@@ -117,7 +117,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ *
 		} else {
 			memcpy(buf, "???", sizeof("???"));
 		}
-		
+
 		fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data);
 
 		fprintf(slowlog, "%s()", buf);
@@ -144,7 +144,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ *
 			}
 
 			type = (zend_uchar *)&l;
-			if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) { 
+			if (0 > fpm_trace_get_long(function + offsetof(zend_function, type), &l)) {
 				return -1;
 			}
 
@@ -174,7 +174,7 @@ static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog) /* {{{ *
 					lineno = *lu;
 				}
 				break;
-			} 
+			}
 
 			if (0 > fpm_trace_get_long(prev + offsetof(zend_execute_data, prev_execute_data), &l)) {
 				return -1;
diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c
index 8b73df895d..b2ce46356f 100644
--- a/sapi/fpm/fpm/fpm_scoreboard.c
+++ b/sapi/fpm/fpm/fpm_scoreboard.c
@@ -247,7 +247,7 @@ void fpm_scoreboard_free(struct fpm_scoreboard_s *scoreboard) /* {{{ */
 
 	scoreboard_size        = sizeof(struct fpm_scoreboard_s) + (scoreboard->nprocs) * sizeof(struct fpm_scoreboard_proc_s *);
 	scoreboard_nprocs_size = sizeof(struct fpm_scoreboard_proc_s) * scoreboard->nprocs;
-	
+
 	fpm_shm_free(scoreboard, scoreboard_size + scoreboard_nprocs_size);
 }
 /* }}} */
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index 81bd695eaf..3545f94d39 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -501,7 +501,7 @@ static int lsapi_module_main(int show_source)
     if (php_request_startup() == FAILURE ) {
         return -1;
     }
-    
+
     if (show_source) {
         zend_syntax_highlighter_ini syntax_highlighter_ini;
 
@@ -782,7 +782,7 @@ static int lsapi_activate_user_ini_walk_down_the_path(_lsapi_activate_user_ini_c
                 strncmp(ctx->path, ctx->doc_root, docroot_len) != 0;
 
         if (is_outside_of_docroot) {
-            php_parse_user_ini_file(ctx->path, PG(user_ini_filename), 
+            php_parse_user_ini_file(ctx->path, PG(user_ini_filename),
                                     &ctx->entry->user_config);
         } else {
             walk_down_the_path(ctx->doc_root, ctx->path,
@@ -806,7 +806,7 @@ static int lsapi_activate_user_ini_finally(_lsapi_activate_user_ini_ctx *ctx,
     fn_activate_user_ini_chain_t *fn_next = next;
 
     DEBUG_MESSAGE("calling php_ini_activate_config()");
-    php_ini_activate_config(&ctx->entry->user_config, PHP_INI_PERDIR, 
+    php_ini_activate_config(&ctx->entry->user_config, PHP_INI_PERDIR,
                             PHP_INI_STAGE_HTACCESS);
 
     if (*fn_next) {
@@ -837,7 +837,7 @@ static int lsapi_activate_user_ini( void )
         &lsapi_activate_user_ini_finally,
         NULL
     };
-    
+
     return fn_chain[0](&ctx, (fn_activate_user_ini_chain_t*)(fn_chain + 1));
 }
 
@@ -995,7 +995,7 @@ static int cli_main( int argc, char * argv[] )
         zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */
         CG(in_compilation) = 0; /* not initialized but needed for several options */
         SG(options) |= SAPI_OPTION_NO_CHDIR;
-        
+
 #if PHP_MAJOR_VERSION < 7
         EG(uninitialized_zval_ptr) = NULL;
 #endif
@@ -1264,7 +1264,7 @@ int main( int argc, char * argv[] )
      * options: the latter override the former.
      */
     init_sapi_from_env(&lsapi_sapi_module);
-    
+
     if ( ignore_php_ini )
         lsapi_sapi_module.php_ini_ignore = 1;
 
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
index 9f58901432..4826dcc437 100644
--- a/sapi/litespeed/lsapilib.c
+++ b/sapi/litespeed/lsapilib.c
@@ -568,8 +568,8 @@ static int validateHeaders( LSAPI_Request * pReq )
     {
         if ( pReq->m_pHeaderIndex->m_headerOff[i] )
         {
-            if (pReq->m_pHeaderIndex->m_headerOff[i] > totalLen 
-                || pReq->m_pHeaderIndex->m_headerLen[i] 
+            if (pReq->m_pHeaderIndex->m_headerOff[i] > totalLen
+                || pReq->m_pHeaderIndex->m_headerLen[i]
                     + pReq->m_pHeaderIndex->m_headerOff[i] > totalLen)
                 return -1;
         }
@@ -581,8 +581,8 @@ static int validateHeaders( LSAPI_Request * pReq )
         pEnd = pCur + pReq->m_pHeader->m_cntUnknownHeaders;
         while( pCur < pEnd )
         {
-            if (pCur->nameOff > totalLen 
-                || pCur->nameOff + pCur->nameLen > totalLen 
+            if (pCur->nameOff > totalLen
+                || pCur->nameOff + pCur->nameLen > totalLen
                 || pCur->valueOff > totalLen
                 || pCur->valueOff + pCur->valueLen > totalLen)
                 return -1;
@@ -1033,13 +1033,13 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen )
     if ( parseEnv( pReq->m_pEnvList, pReq->m_pHeader->m_cntEnv,
                 &pBegin, pEnd ) == -1 )
         return -1;
-    if (pReq->m_pHeader->m_scriptFileOff < 0 
-        || pReq->m_pHeader->m_scriptFileOff >= totalLen 
+    if (pReq->m_pHeader->m_scriptFileOff < 0
+        || pReq->m_pHeader->m_scriptFileOff >= totalLen
         || pReq->m_pHeader->m_scriptNameOff < 0
         || pReq->m_pHeader->m_scriptNameOff >= totalLen
         || pReq->m_pHeader->m_queryStringOff < 0
         || pReq->m_pHeader->m_queryStringOff >= totalLen
-        || pReq->m_pHeader->m_requestMethodOff < 0 
+        || pReq->m_pHeader->m_requestMethodOff < 0
         || pReq->m_pHeader->m_requestMethodOff >= totalLen)
     {
         fprintf(stderr, "%d: bad request header - ERROR#1\n", getpid());
@@ -1070,13 +1070,13 @@ static int parseRequest( LSAPI_Request * pReq, int totalLen )
     {
         fixHeaderIndexEndian( pReq );
     }
-    
+
     if (validateHeaders(pReq) == -1)
     {
         fprintf(stderr, "%d: bad request header - ERROR#2\n", getpid());
         return -1;
     }
-    
+
     pReq->m_reqBodyLen = pReq->m_pHeader->m_reqBodyLen;
     if ( pReq->m_reqBodyLen == -2 )
     {
@@ -1445,10 +1445,10 @@ char * LSAPI_GetHeader_r( LSAPI_Request * pReq, int headerIndex )
     off = pReq->m_pHeaderIndex->m_headerOff[ headerIndex ];
     if ( !off )
         return NULL;
-    if ( *(pReq->m_pHttpHeader + off 
+    if ( *(pReq->m_pHttpHeader + off
         + pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) )
     {
-        *( pReq->m_pHttpHeader + off 
+        *( pReq->m_pHttpHeader + off
             + pReq->m_pHeaderIndex->m_headerLen[ headerIndex ]) = 0;
     }
     return pReq->m_pHttpHeader + off;
@@ -1894,7 +1894,7 @@ static char * GetHeaderVar( LSAPI_Request * pReq, const char * name )
         {
             if ( strcmp( name, CGI_HEADERS[i] ) == 0 )
             {
-                pValue = pReq->m_pHttpHeader 
+                pValue = pReq->m_pHttpHeader
                          + pReq->m_pHeaderIndex->m_headerOff[i];
                 if ( *(pValue + pReq->m_pHeaderIndex->m_headerLen[i]) != '\0')
                 {
@@ -1930,7 +1930,7 @@ static char * GetHeaderVar( LSAPI_Request * pReq, const char * name )
             if (( pKey == pKeyEnd )&& (!*p ))
             {
                 pValue = pReq->m_pHttpHeader + pCur->valueOff;
-                
+
                 if ( *(pValue + pCur->valueLen) != '\0')
                 {
                     *(pValue + pCur->valueLen) = '\0';
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 706367ed35..db3798bef7 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1324,7 +1324,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{
 {
 	zend_mm_heap *heap = zend_mm_get_heap();
 	if (UNEXPECTED(heap == p)) {
-		/* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) 
+		/* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0)
 		 * let's prevent it from segfault for now
 		 */
 	} else {
diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c
index ee5a656b60..93040e7690 100644
--- a/sapi/phpdbg/phpdbg_io.c
+++ b/sapi/phpdbg/phpdbg_io.c
@@ -193,14 +193,14 @@ PHPDBG_API int phpdbg_mixed_read(int sock, char *ptr, int len, int tmo) {
 static int phpdbg_output_pager(int sock, const char *ptr, int len) {
 	int count = 0, bytes = 0;
 	const char *p = ptr, *endp = ptr + len;
-	
+
 	while ((p = memchr(p, '\n', endp - p))) {
 		count++;
 		p++;
-		
+
 		if (count % PHPDBG_G(lines) == 0) {
 			bytes += write(sock, ptr + bytes, (p - ptr) - bytes);
-			
+
 			if (memchr(p, '\n', endp - p)) {
 				char buf[PHPDBG_MAX_CMD];
 				zend_quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---"));
@@ -224,7 +224,7 @@ PHPDBG_API int phpdbg_mixed_write(int sock, const char *ptr, int len) {
 	if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) {
 		return phpdbg_send_bytes(sock, ptr, len);
 	}
-	
+
 	if ((PHPDBG_G(flags) & PHPDBG_HAS_PAGINATION)
 	 && !(PHPDBG_G(flags) & PHPDBG_WRITE_XML)
 	 && PHPDBG_G(io)[PHPDBG_STDOUT].fd == sock
diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 55bc3275ac..5366e00da7 100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -85,38 +85,38 @@ restart:
 yyc_INITIAL:
 	{
 		static const unsigned char yybm[] = {
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0, 128,   0,   0,   0, 128,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			128,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0, 128,   0,   0,   0, 128,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			128,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
 		};
 		YYDEBUG(1, *YYCURSOR);
 		YYFILL(4);
@@ -331,71 +331,71 @@ yyc_NORMAL:
 	{
 		static const unsigned char yybm[] = {
 			/* table 1 .. 8: 0 */
-			  0,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  40,   0,  62,  62,  40,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 40,  62,  50,  40,  62,  62,  62,  14, 
-			 62,  62,  62,  62,  62,  62,  63,  62, 
-			127, 127, 127, 127, 127, 127, 127, 127, 
-			127, 127,  40,  62,  62,  62,  62,  62, 
-			 62, 254, 254, 254, 254, 254, 254, 190, 
-			190, 190, 190, 190, 190, 190, 190, 190, 
-			190, 190, 190, 190, 190, 190, 190, 190, 
-			190, 190, 190,  62,   2,  62,  62,  62, 
-			 62, 254, 254, 254, 254, 254, 254, 190, 
-			190, 190, 190, 190, 190, 190, 190, 190, 
-			190, 190, 190, 190, 190, 190, 190, 190, 
-			190, 190, 190,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
-			 62,  62,  62,  62,  62,  62,  62,  62, 
+			  0,  62,  62,  62,  62,  62,  62,  62,
+			 62,  40,   0,  62,  62,  40,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 40,  62,  50,  40,  62,  62,  62,  14,
+			 62,  62,  62,  62,  62,  62,  63,  62,
+			127, 127, 127, 127, 127, 127, 127, 127,
+			127, 127,  40,  62,  62,  62,  62,  62,
+			 62, 254, 254, 254, 254, 254, 254, 190,
+			190, 190, 190, 190, 190, 190, 190, 190,
+			190, 190, 190, 190, 190, 190, 190, 190,
+			190, 190, 190,  62,   2,  62,  62,  62,
+			 62, 254, 254, 254, 254, 254, 254, 190,
+			190, 190, 190, 190, 190, 190, 190, 190,
+			190, 190, 190, 190, 190, 190, 190, 190,
+			190, 190, 190,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
+			 62,  62,  62,  62,  62,  62,  62,  62,
 			/* table 9 .. 10: 256 */
-			  0,  64,  64,  64,  64,  64,  64,  64, 
-			 64, 128,   0,  64,  64, 128,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			128,  64,   0,   0,  64,  64,  64,   0, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,   0,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
-			 64,  64,  64,  64,  64,  64,  64,  64, 
+			  0,  64,  64,  64,  64,  64,  64,  64,
+			 64, 128,   0,  64,  64, 128,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			128,  64,   0,   0,  64,  64,  64,   0,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,   0,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
+			 64,  64,  64,  64,  64,  64,  64,  64,
 		};
 		YYDEBUG(27, *YYCURSOR);
 		YYFILL(11);
@@ -1499,38 +1499,38 @@ yy146:
 yyc_PRE_RAW:
 	{
 		static const unsigned char yybm[] = {
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,  64,   0,   0,   0,  64,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			 64,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0, 128,   0, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,  64,   0,   0,   0,  64,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			 64,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0, 128,   0,
+			128, 128, 128, 128, 128, 128, 128, 128,
+			128, 128,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
+			  0,   0,   0,   0,   0,   0,   0,   0,
 		};
 		YYDEBUG(147, *YYCURSOR);
 		YYFILL(2);
@@ -1641,38 +1641,38 @@ yy160:
 yyc_RAW:
 	{
 		static const unsigned char yybm[] = {
-			  0, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232,   0, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232,  64, 224, 232, 232, 232,  32, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232,  16, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
-			232, 232, 232, 232, 232, 232, 232, 232, 
+			  0, 232, 232, 232, 232, 232, 232, 232,
+			232, 232,   0, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232,  64, 224, 232, 232, 232,  32,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232,  16, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
+			232, 232, 232, 232, 232, 232, 232, 232,
 		};
 		YYDEBUG(163, *YYCURSOR);
 		YYFILL(1);
diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c
index da08df2199..16ca21d5d1 100644
--- a/sapi/phpdbg/phpdbg_parser.c
+++ b/sapi/phpdbg/phpdbg_parser.c
@@ -1,19 +1,19 @@
 /* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-   
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c
index ed5633b845..bc1ac22f26 100644
--- a/sapi/phpdbg/phpdbg_print.c
+++ b/sapi/phpdbg/phpdbg_print.c
@@ -370,7 +370,7 @@ void phpdbg_print_opcodes_class(const char *class) {
 				}
 			}
 		} ZEND_HASH_FOREACH_END();
-		
+
 		return;
 	}
 
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index c845ee194f..220288493e 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -618,7 +618,7 @@ int phpdbg_compile(void) /* {{{ */
 			data->len += start_line_len;
 			for (i = 1; i <= data->lines; i++) {
 				data->line[i] += start_line_len;
-			}		
+			}
 			zend_hash_update_ptr(&PHPDBG_G(file_sources), PHPDBG_G(ops)->filename, data);
 		}
 
diff --git a/sapi/phpdbg/phpdbg_set.c b/sapi/phpdbg/phpdbg_set.c
index 7cb8d0639f..dc69221a50 100644
--- a/sapi/phpdbg/phpdbg_set.c
+++ b/sapi/phpdbg/phpdbg_set.c
@@ -74,7 +74,7 @@ PHPDBG_SET(pagination) /* {{{ */
 		default:
 			phpdbg_error("setpagination", "type=\"wrongargs\"", "set pagination used incorrectly: set pagination <on|off>");
 	}
-	
+
 	return SUCCESS;
 } /* }}} */
 
@@ -90,7 +90,7 @@ PHPDBG_SET(lines) /* {{{ */
 		default:
 			phpdbg_error("setlines", "type=\"wrongargs\"", "set lines used incorrectly: set lines <number>");
 	}
-	
+
 	return SUCCESS;
 } /* }}} */
 
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
index 88593c552f..7eddf1b052 100644
--- a/sapi/phpdbg/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c
@@ -429,7 +429,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) {
 			phpdbg_store_watchpoint_btree(&coll->ref);
 			phpdbg_activate_watchpoint(&coll->ref);
 			phpdbg_watch_backup_data(&coll->ref);
-			
+
 			zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0);
 			zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll);
 		}