This commit was manufactured by cvs2svn to create tag 'php_4_3_1'.

Mention the fact that zlib extension is now built-in in win32 distro.

NEWS

@@ -1,12 +1,14 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-? ? ??? 2002, Version 4.3.0
-- Aliased dba_popen() to dba_open() until 4.3.1 when persistent STDIO streams
-  are introduced. (Andrei)
-- Fixed a security bug in the bundled MySQL library. (Georg, Stefan)
-- ATTENTION! "make install" will *by default* install the CLI SAPI binary in 
-  {PREFIX}/bin/php. If you don't disable the CGI binary, it will be
-  installed as {PREFIX}/bin/php-cgi.
+17 Feb 2003, Version 4.3.1
+- Fixed serious security vulnerability in CGI SAPI. (Shane)
+
+27 Dec 2002, Version 4.3.0
+- If you don't specify building any other SAPI "make install" will install the
+  CGI SAPI binary in {PREFIX}/bin/php. If you want to install CLI SAPI in that
+  location use "make install-cli" after "make install" or add --disable-cgi
+  to your configure options. In the Windows distribution CLI SAPI is included
+  in the "cli" folder. (Edin)
 - Removed extensions: (Jan, Jani, Sebastian)
   . ext/aspell
   . ext/ccvs
@@ -17,6 +19,17 @@ PHP 4                                                                      NEWS
 - Moved extensions to PECL (http://pear.php.net/): (James, Derick)
   . ext/vpopmail
   . ext/cybermut
+- Make PHP_AUTH_* variables not available in safe mode under Apache when an
+  external basic auth mechanism is used. (Philip)
+- Aliased dba_popen() to dba_open() until 4.3.1 when persistent STDIO streams
+  are introduced. (Andrei)
+- Fixed a security bug in the bundled MySQL library. (Georg, Stefan)
+- ZLIB extension is now built-in in the Windows distribution.
+  External extension (php_zlib.dll) has been removed. (Edin)
+- Fixed a bug in ISO-8601 week calculation
+- Fixed a crash when using invalid color index with imagecolortransparent()
+  (Pierre-Alain Joye).
+- Fixed bug #20987 (no handling for client certificates). (Ilia)
 - Fixed bug #21039 (crash when not supplying an IV to mcrypt_generic_init).
   (Derick)
 - Fixed bug #20936 (openssl_pkey_get was broken). (jeroen@derks.it, Wez)
@@ -376,8 +389,6 @@ PHP 4                                                                      NEWS
 - Added preliminary SAX-Input support. It's now possible to build a DomDocument
   with SAX-Events. (chregu)
 - Bundled GD library 2.0.1 with php (ext/gd/libgd) (Rasmus, Jani, Markus, Edin)
-- Fixed bug with Apache which let PHP_AUTH_* variables to be set when
-  external basic auth mechanism was used. (Jani)
 - Fixed bzopen() crash in thread-safe mode. (Andrei)
 - Added better error-messages (3rd parameter) and validating of DTDs (2nd
   parameter) to domxml_open_mem() and domxml_open_file(). (Christian)

configure.in

@@ -43,8 +43,8 @@ AC_CONFIG_HEADER(main/php_config.h)
 
 MAJOR_VERSION=4
 MINOR_VERSION=3
-RELEASE_VERSION=0
-EXTRA_VERSION="RC4"
+RELEASE_VERSION=1
+EXTRA_VERSION=""
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context

ext/curl/curl.c

@@ -733,6 +733,7 @@ PHP_FUNCTION(curl_setopt)
 		case CURLOPT_COOKIEJAR:
 		case CURLOPT_SSL_CIPHER_LIST: 
 		case CURLOPT_SSLKEY:
+		case CURLOPT_SSLCERT:
 		case CURLOPT_SSLKEYTYPE: 
 		case CURLOPT_SSLKEYPASSWD: 
 		case CURLOPT_SSLENGINE: 

ext/dba/php_db4.h

@@ -1,12 +0,0 @@
-#ifndef PHP_DB4_H
-#define PHP_DB4_H
-
-#if DBA_DB4
-
-#include "php_dba.h"
-
-DBA_FUNCS(db4);
-
-#endif
-
-#endif

ext/dba/tests/dba_handler.inc

@@ -67,7 +67,7 @@
 	} else {
 		echo "Error reading database\n";
 	}
-	if ($dba_reader) {
+	if (!empty($dba_reader)) {
 		dba_close($dba_reader);
 	}
 	if (($db_file = dba_popen($db_filename, 'r'.($handler!='gdbm'?'-':''), $handler))!==FALSE) {

ext/exif/exif.c

@@ -1534,7 +1534,7 @@ static int exif_file_sections_free(image_info_type *ImageInfo)
 */
 static void exif_iif_add_value(image_info_type *image_info, int section_index, char *name, int tag, int format, size_t length, void* value, int motorola_intel TSRMLS_DC)
 {
-	size_t index;
+	size_t idex;
 	void *vptr;
 	image_info_value *info_value;
 	image_info_data  *info_data;
@@ -1620,9 +1620,9 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c
 			} else {
 				info_value = &info_data->value;
 			}
-			for (index=0,vptr=value; index<length; index++,(int)vptr+=php_tiff_bytes_per_format[format]) {
+			for (idex=0,vptr=value; idex<length; idex++,vptr=(char *) vptr + php_tiff_bytes_per_format[format]) {
 				if (length>1) {
-					info_value = &info_data->value.list[index];
+					info_value = &info_data->value.list[idex];
 				}
 				switch (format) {
 					case TAG_FMT_USHORT:

ext/ftp/CREDITS

@@ -1,3 +1,2 @@
 FTP
-Andrew Skalski
-Stefan Esser
+Stefan Esser, Andrew Skalski

ext/mime_magic/mime_magic.c

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Hartmut Holzgraefe  <hartmut@six.de>                         |
+  | Author: Hartmut Holzgraefe  <hholzgra@php.net>                       |
   +----------------------------------------------------------------------+
 
   $Id$ 
@@ -274,7 +274,7 @@ PHP_MINIT_FUNCTION(mime_magic)
 PHP_MSHUTDOWN_FUNCTION(mime_magic)
 {
 	UNREGISTER_INI_ENTRIES();
-	if (mime_global.magic != NULL && (int)mime_global.magic != -1) {
+	if (mime_global.magic != NULL && mime_global.magic != (struct magic *) -1) {
 		struct magic *iter = mime_global.magic;
 		while (iter != NULL) {
 			struct magic *iter_next = iter->next;	
@@ -312,7 +312,7 @@ PHP_FUNCTION(mime_content_type)
 		return;
 	}
 
-	if ((int) conf->magic == -1) {
+	if (conf->magic == (struct magic *)-1) {
 		php_error(E_ERROR, MODNAME " could not be initialized, magic file %s is not avaliable",  conf->magicfile);
 		RETURN_FALSE;
 	} 
@@ -358,7 +358,7 @@ static int apprentice(void)
     fname = conf->magicfile; /* todo cwd? */
     f = fopen(fname, "rb");
     if (f == NULL) {
-		(int) conf->magic = -1;
+		conf->magic = (struct magic *)-1;
 		return -1;
     }
 

ext/mysql/php_mysql.c

@@ -889,7 +889,7 @@ PHP_FUNCTION(mysql_get_client_info)
 		WRONG_PARAM_COUNT;
 	}
 
-	RETURN_STRING(mysql_get_client_info(),1);	
+	RETURN_STRING((char *)mysql_get_client_info(),1);	
 }
 /* }}} */
 
@@ -919,7 +919,7 @@ PHP_FUNCTION(mysql_get_host_info)
 
 	ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
 
-	RETURN_STRING(mysql_get_host_info(&mysql->conn),1);
+	RETURN_STRING((char *)mysql_get_host_info(&mysql->conn),1);
 }
 /* }}} */
 
@@ -979,7 +979,7 @@ PHP_FUNCTION(mysql_get_server_info)
 
 	ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
 
-	RETURN_STRING(mysql_get_server_info(&mysql->conn),1);
+	RETURN_STRING((char *)mysql_get_server_info(&mysql->conn),1);
 }
 /* }}} */
 
@@ -1003,7 +1003,7 @@ PHP_FUNCTION(mysql_info)
 
 	ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
 
-	if ((str = mysql_info(&mysql->conn))) {
+	if ((str = (char *)mysql_info(&mysql->conn))) {
 		RETURN_STRING(str,1);
 	} else {
 		RETURN_FALSE;
@@ -1051,7 +1051,7 @@ PHP_FUNCTION(mysql_stat)
 	}
 	ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink);
 
-	RETURN_STRING(mysql_stat(&mysql->conn), 1);
+	RETURN_STRING((char *)mysql_stat(&mysql->conn), 1);
 }
 /* }}} */
 
@@ -1542,7 +1542,7 @@ PHP_FUNCTION(mysql_error)
 	
 	ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink);
 	
-	RETURN_STRING(mysql_error(&mysql->conn), 1);
+	RETURN_STRING((char *)mysql_error(&mysql->conn), 1);
 }
 /* }}} */
 
@@ -1857,7 +1857,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type,
 	MYSQL_ROW mysql_row;
 	MYSQL_FIELD *mysql_field;
 	mysql_row_length_type *mysql_row_lengths;
-	int num_fields;
 	int i;
 
 	if (ZEND_NUM_ARGS() > expected_args) {
@@ -1892,8 +1891,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type,
 		RETURN_FALSE;
 	}
 
-	num_fields = mysql_num_fields(mysql_result);
-	
 	if (array_init(return_value)==FAILURE) {
 		RETURN_FALSE;
 	}

ext/ncurses/CREDITS

@@ -1,2 +1,2 @@
 ncurses
-Hartmut Holzgraefe
+Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter

ext/ncurses/ncurses.c

@@ -35,10 +35,10 @@ int le_ncurses_panels;
 
 static void ncurses_destruct_window(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 {
-    WINDOW **pwin = (WINDOW **)rsrc->ptr;
+	WINDOW **pwin = (WINDOW **)rsrc->ptr;
 
-    delwin(*pwin);
-    efree(pwin);
+	delwin(*pwin);
+	efree(pwin);
 }
 
 #if HAVE_NCURSES_PANEL
@@ -54,16 +54,16 @@ static void ncurses_destruct_panel(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 /* {{{ ncurses_module_entry
  */
 zend_module_entry ncurses_module_entry = {
-    STANDARD_MODULE_HEADER,
-    "ncurses",
-    ncurses_functions,
-    PHP_MINIT(ncurses),
-    PHP_MSHUTDOWN(ncurses),
-    PHP_RINIT(ncurses),     /* Replace with NULL if there's nothing to do at request start */
-    PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do at request end */
-    PHP_MINFO(ncurses),
-    NO_VERSION_YET,
-    STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"ncurses",
+	ncurses_functions,
+	PHP_MINIT(ncurses),
+	PHP_MSHUTDOWN(ncurses),
+	PHP_RINIT(ncurses),     /* Replace with NULL if there's nothing to do at request start */
+	PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do at request end */
+	PHP_MINFO(ncurses),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
@@ -75,8 +75,8 @@ ZEND_GET_MODULE(ncurses)
  */
 /* Remove comments and fill if you need to have entries in php.ini
 PHP_INI_BEGIN()
-    STD_PHP_INI_ENTRY("ncurses.value",      "42", PHP_INI_ALL, OnUpdateInt, global_value, zend_ncurses_globals, ncurses_globals)
-    STD_PHP_INI_ENTRY("ncurses.string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_ncurses_globals, ncurses_globals)
+	STD_PHP_INI_ENTRY("ncurses.value",      "42", PHP_INI_ALL, OnUpdateInt, global_value, zend_ncurses_globals, ncurses_globals)
+	STD_PHP_INI_ENTRY("ncurses.string", "foobar", PHP_INI_ALL, OnUpdateString, global_string, zend_ncurses_globals, ncurses_globals)
 PHP_INI_END()
 */
 /* }}} */
@@ -84,175 +84,181 @@ PHP_INI_END()
 #define PHP_NCURSES_CONST(x)  REGISTER_LONG_CONSTANT("NCURSES_"#x, x, CONST_CS | CONST_PERSISTENT)
 #define PHP_NCURSES_FKEY_CONST(x)  REGISTER_LONG_CONSTANT("NCURSES_KEY_F"#x, KEY_F0 + x, CONST_CS | CONST_PERSISTENT)
 
+static void php_ncurses_init_globals(zend_ncurses_globals *ncurses_globals)
+{
+	memset(ncurses_globals, 0, sizeof(*ncurses_globals));
+}
 
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(ncurses)
 {
-    /* color constants */
-    PHP_NCURSES_CONST(COLOR_BLACK);
-    PHP_NCURSES_CONST(COLOR_RED);
-    PHP_NCURSES_CONST(COLOR_GREEN);
-    PHP_NCURSES_CONST(COLOR_YELLOW);
-    PHP_NCURSES_CONST(COLOR_BLUE);
-    PHP_NCURSES_CONST(COLOR_MAGENTA);
-    PHP_NCURSES_CONST(COLOR_CYAN);
-    PHP_NCURSES_CONST(COLOR_WHITE);
+	/* color constants */
+	PHP_NCURSES_CONST(COLOR_BLACK);
+	PHP_NCURSES_CONST(COLOR_RED);
+	PHP_NCURSES_CONST(COLOR_GREEN);
+	PHP_NCURSES_CONST(COLOR_YELLOW);
+	PHP_NCURSES_CONST(COLOR_BLUE);
+	PHP_NCURSES_CONST(COLOR_MAGENTA);
+	PHP_NCURSES_CONST(COLOR_CYAN);
+	PHP_NCURSES_CONST(COLOR_WHITE);
 
-    /* keyboard constants */
-    PHP_NCURSES_CONST(KEY_DOWN);
-    PHP_NCURSES_CONST(KEY_UP);
-    PHP_NCURSES_CONST(KEY_LEFT);
-    PHP_NCURSES_CONST(KEY_RIGHT);
-    PHP_NCURSES_CONST(KEY_BACKSPACE);
-    PHP_NCURSES_CONST(KEY_MOUSE);
-    PHP_NCURSES_CONST(KEY_F0);
+	/* keyboard constants */
+	PHP_NCURSES_CONST(KEY_DOWN);
+	PHP_NCURSES_CONST(KEY_UP);
+	PHP_NCURSES_CONST(KEY_LEFT);
+	PHP_NCURSES_CONST(KEY_RIGHT);
+	PHP_NCURSES_CONST(KEY_BACKSPACE);
+	PHP_NCURSES_CONST(KEY_MOUSE);
+	PHP_NCURSES_CONST(KEY_F0);
 
 
-    /* TODO:this macro sux, we have 65 function key,
-       so we need a little loop */
-    PHP_NCURSES_FKEY_CONST(1);
-    PHP_NCURSES_FKEY_CONST(2);
-    PHP_NCURSES_FKEY_CONST(3);
-    PHP_NCURSES_FKEY_CONST(4);
-    PHP_NCURSES_FKEY_CONST(5);
-    PHP_NCURSES_FKEY_CONST(6);
-    PHP_NCURSES_FKEY_CONST(7);
-    PHP_NCURSES_FKEY_CONST(8);
-    PHP_NCURSES_FKEY_CONST(9);
-    PHP_NCURSES_FKEY_CONST(10);
-    PHP_NCURSES_FKEY_CONST(11);
-    PHP_NCURSES_FKEY_CONST(12);
+	/* TODO:this macro sux, we have 65 function key,
+	   so we need a little loop */
+	PHP_NCURSES_FKEY_CONST(1);
+	PHP_NCURSES_FKEY_CONST(2);
+	PHP_NCURSES_FKEY_CONST(3);
+	PHP_NCURSES_FKEY_CONST(4);
+	PHP_NCURSES_FKEY_CONST(5);
+	PHP_NCURSES_FKEY_CONST(6);
+	PHP_NCURSES_FKEY_CONST(7);
+	PHP_NCURSES_FKEY_CONST(8);
+	PHP_NCURSES_FKEY_CONST(9);
+	PHP_NCURSES_FKEY_CONST(10);
+	PHP_NCURSES_FKEY_CONST(11);
+	PHP_NCURSES_FKEY_CONST(12);
 
-    PHP_NCURSES_CONST(KEY_DL);
-    PHP_NCURSES_CONST(KEY_IL);
-    PHP_NCURSES_CONST(KEY_DC);
-    PHP_NCURSES_CONST(KEY_IC);
-    PHP_NCURSES_CONST(KEY_EIC);
-    PHP_NCURSES_CONST(KEY_CLEAR);
-    PHP_NCURSES_CONST(KEY_EOS);
-    PHP_NCURSES_CONST(KEY_EOL);
-    PHP_NCURSES_CONST(KEY_SF);
-    PHP_NCURSES_CONST(KEY_SR);
-    PHP_NCURSES_CONST(KEY_NPAGE);
-    PHP_NCURSES_CONST(KEY_PPAGE);
-    PHP_NCURSES_CONST(KEY_STAB);
-    PHP_NCURSES_CONST(KEY_CTAB);
-    PHP_NCURSES_CONST(KEY_CATAB);
-    PHP_NCURSES_CONST(KEY_ENTER);
-    PHP_NCURSES_CONST(KEY_SRESET);
-    PHP_NCURSES_CONST(KEY_RESET);
-    PHP_NCURSES_CONST(KEY_PRINT);
-    PHP_NCURSES_CONST(KEY_LL);
-    PHP_NCURSES_CONST(KEY_A1);
-    PHP_NCURSES_CONST(KEY_A3);
-    PHP_NCURSES_CONST(KEY_B2);
-    PHP_NCURSES_CONST(KEY_C1);
-    PHP_NCURSES_CONST(KEY_C3);
-    PHP_NCURSES_CONST(KEY_BTAB);
-    PHP_NCURSES_CONST(KEY_BEG);
-    PHP_NCURSES_CONST(KEY_CANCEL);
-    PHP_NCURSES_CONST(KEY_CLOSE);
-    PHP_NCURSES_CONST(KEY_COMMAND);
-    PHP_NCURSES_CONST(KEY_COPY);
-    PHP_NCURSES_CONST(KEY_CREATE);
-    PHP_NCURSES_CONST(KEY_END);
-    PHP_NCURSES_CONST(KEY_EXIT);
-    PHP_NCURSES_CONST(KEY_FIND);
-    PHP_NCURSES_CONST(KEY_HELP);
-    PHP_NCURSES_CONST(KEY_MARK);
-    PHP_NCURSES_CONST(KEY_MESSAGE);
-    PHP_NCURSES_CONST(KEY_MOVE);
-    PHP_NCURSES_CONST(KEY_NEXT);
-    PHP_NCURSES_CONST(KEY_OPEN);
-    PHP_NCURSES_CONST(KEY_OPTIONS);
-    PHP_NCURSES_CONST(KEY_PREVIOUS);
-    PHP_NCURSES_CONST(KEY_REDO);
-    PHP_NCURSES_CONST(KEY_REFERENCE);
-    PHP_NCURSES_CONST(KEY_REFRESH);
-    PHP_NCURSES_CONST(KEY_REPLACE);
-    PHP_NCURSES_CONST(KEY_RESTART);
-    PHP_NCURSES_CONST(KEY_RESUME);
-    PHP_NCURSES_CONST(KEY_SAVE);
-    PHP_NCURSES_CONST(KEY_SBEG);
-    PHP_NCURSES_CONST(KEY_SCANCEL);
-    PHP_NCURSES_CONST(KEY_SCOMMAND);
-    PHP_NCURSES_CONST(KEY_SCOPY);
-    PHP_NCURSES_CONST(KEY_SCREATE);
-    PHP_NCURSES_CONST(KEY_SDC);
-    PHP_NCURSES_CONST(KEY_SDL);
-    PHP_NCURSES_CONST(KEY_SELECT);
-    PHP_NCURSES_CONST(KEY_SEND);
-    PHP_NCURSES_CONST(KEY_SEOL);
-    PHP_NCURSES_CONST(KEY_SEXIT);
-    PHP_NCURSES_CONST(KEY_SFIND);
-    PHP_NCURSES_CONST(KEY_SHELP);
-    PHP_NCURSES_CONST(KEY_SHOME);
-    PHP_NCURSES_CONST(KEY_SIC);
-    PHP_NCURSES_CONST(KEY_SLEFT);
-    PHP_NCURSES_CONST(KEY_SMESSAGE);
-    PHP_NCURSES_CONST(KEY_SMOVE);
-    PHP_NCURSES_CONST(KEY_SNEXT);
-    PHP_NCURSES_CONST(KEY_SOPTIONS);
-    PHP_NCURSES_CONST(KEY_SPREVIOUS);
-    PHP_NCURSES_CONST(KEY_SPRINT);
-    PHP_NCURSES_CONST(KEY_SREDO);
-    PHP_NCURSES_CONST(KEY_SREPLACE);
-    PHP_NCURSES_CONST(KEY_SRIGHT);
-    PHP_NCURSES_CONST(KEY_SRSUME);
-    PHP_NCURSES_CONST(KEY_SSAVE);
-    PHP_NCURSES_CONST(KEY_SSUSPEND);
-    PHP_NCURSES_CONST(KEY_SUNDO);
-    PHP_NCURSES_CONST(KEY_SUSPEND);
-    PHP_NCURSES_CONST(KEY_UNDO);
-    PHP_NCURSES_CONST(KEY_RESIZE);
+	PHP_NCURSES_CONST(KEY_DL);
+	PHP_NCURSES_CONST(KEY_IL);
+	PHP_NCURSES_CONST(KEY_DC);
+	PHP_NCURSES_CONST(KEY_IC);
+	PHP_NCURSES_CONST(KEY_EIC);
+	PHP_NCURSES_CONST(KEY_CLEAR);
+	PHP_NCURSES_CONST(KEY_EOS);
+	PHP_NCURSES_CONST(KEY_EOL);
+	PHP_NCURSES_CONST(KEY_SF);
+	PHP_NCURSES_CONST(KEY_SR);
+	PHP_NCURSES_CONST(KEY_NPAGE);
+	PHP_NCURSES_CONST(KEY_PPAGE);
+	PHP_NCURSES_CONST(KEY_STAB);
+	PHP_NCURSES_CONST(KEY_CTAB);
+	PHP_NCURSES_CONST(KEY_CATAB);
+	PHP_NCURSES_CONST(KEY_ENTER);
+	PHP_NCURSES_CONST(KEY_SRESET);
+	PHP_NCURSES_CONST(KEY_RESET);
+	PHP_NCURSES_CONST(KEY_PRINT);
+	PHP_NCURSES_CONST(KEY_LL);
+	PHP_NCURSES_CONST(KEY_A1);
+	PHP_NCURSES_CONST(KEY_A3);
+	PHP_NCURSES_CONST(KEY_B2);
+	PHP_NCURSES_CONST(KEY_C1);
+	PHP_NCURSES_CONST(KEY_C3);
+	PHP_NCURSES_CONST(KEY_BTAB);
+	PHP_NCURSES_CONST(KEY_BEG);
+	PHP_NCURSES_CONST(KEY_CANCEL);
+	PHP_NCURSES_CONST(KEY_CLOSE);
+	PHP_NCURSES_CONST(KEY_COMMAND);
+	PHP_NCURSES_CONST(KEY_COPY);
+	PHP_NCURSES_CONST(KEY_CREATE);
+	PHP_NCURSES_CONST(KEY_END);
+	PHP_NCURSES_CONST(KEY_EXIT);
+	PHP_NCURSES_CONST(KEY_FIND);
+	PHP_NCURSES_CONST(KEY_HELP);
+	PHP_NCURSES_CONST(KEY_MARK);
+	PHP_NCURSES_CONST(KEY_MESSAGE);
+	PHP_NCURSES_CONST(KEY_MOVE);
+	PHP_NCURSES_CONST(KEY_NEXT);
+	PHP_NCURSES_CONST(KEY_OPEN);
+	PHP_NCURSES_CONST(KEY_OPTIONS);
+	PHP_NCURSES_CONST(KEY_PREVIOUS);
+	PHP_NCURSES_CONST(KEY_REDO);
+	PHP_NCURSES_CONST(KEY_REFERENCE);
+	PHP_NCURSES_CONST(KEY_REFRESH);
+	PHP_NCURSES_CONST(KEY_REPLACE);
+	PHP_NCURSES_CONST(KEY_RESTART);
+	PHP_NCURSES_CONST(KEY_RESUME);
+	PHP_NCURSES_CONST(KEY_SAVE);
+	PHP_NCURSES_CONST(KEY_SBEG);
+	PHP_NCURSES_CONST(KEY_SCANCEL);
+	PHP_NCURSES_CONST(KEY_SCOMMAND);
+	PHP_NCURSES_CONST(KEY_SCOPY);
+	PHP_NCURSES_CONST(KEY_SCREATE);
+	PHP_NCURSES_CONST(KEY_SDC);
+	PHP_NCURSES_CONST(KEY_SDL);
+	PHP_NCURSES_CONST(KEY_SELECT);
+	PHP_NCURSES_CONST(KEY_SEND);
+	PHP_NCURSES_CONST(KEY_SEOL);
+	PHP_NCURSES_CONST(KEY_SEXIT);
+	PHP_NCURSES_CONST(KEY_SFIND);
+	PHP_NCURSES_CONST(KEY_SHELP);
+	PHP_NCURSES_CONST(KEY_SHOME);
+	PHP_NCURSES_CONST(KEY_SIC);
+	PHP_NCURSES_CONST(KEY_SLEFT);
+	PHP_NCURSES_CONST(KEY_SMESSAGE);
+	PHP_NCURSES_CONST(KEY_SMOVE);
+	PHP_NCURSES_CONST(KEY_SNEXT);
+	PHP_NCURSES_CONST(KEY_SOPTIONS);
+	PHP_NCURSES_CONST(KEY_SPREVIOUS);
+	PHP_NCURSES_CONST(KEY_SPRINT);
+	PHP_NCURSES_CONST(KEY_SREDO);
+	PHP_NCURSES_CONST(KEY_SREPLACE);
+	PHP_NCURSES_CONST(KEY_SRIGHT);
+	PHP_NCURSES_CONST(KEY_SRSUME);
+	PHP_NCURSES_CONST(KEY_SSAVE);
+	PHP_NCURSES_CONST(KEY_SSUSPEND);
+	PHP_NCURSES_CONST(KEY_SUNDO);
+	PHP_NCURSES_CONST(KEY_SUSPEND);
+	PHP_NCURSES_CONST(KEY_UNDO);
+	PHP_NCURSES_CONST(KEY_RESIZE);
 
-    /* screen attribute constants */
-    PHP_NCURSES_CONST(A_NORMAL);
-    PHP_NCURSES_CONST(A_STANDOUT);
-    PHP_NCURSES_CONST(A_UNDERLINE);
-    PHP_NCURSES_CONST(A_REVERSE);
-    PHP_NCURSES_CONST(A_BLINK);
-    PHP_NCURSES_CONST(A_DIM);
-    PHP_NCURSES_CONST(A_BOLD);
-    PHP_NCURSES_CONST(A_PROTECT);
-    PHP_NCURSES_CONST(A_INVIS);
-    PHP_NCURSES_CONST(A_ALTCHARSET);
-    PHP_NCURSES_CONST(A_CHARTEXT);
+	/* screen attribute constants */
+	PHP_NCURSES_CONST(A_NORMAL);
+	PHP_NCURSES_CONST(A_STANDOUT);
+	PHP_NCURSES_CONST(A_UNDERLINE);
+	PHP_NCURSES_CONST(A_REVERSE);
+	PHP_NCURSES_CONST(A_BLINK);
+	PHP_NCURSES_CONST(A_DIM);
+	PHP_NCURSES_CONST(A_BOLD);
+	PHP_NCURSES_CONST(A_PROTECT);
+	PHP_NCURSES_CONST(A_INVIS);
+	PHP_NCURSES_CONST(A_ALTCHARSET);
+	PHP_NCURSES_CONST(A_CHARTEXT);
 
-    /* mouse constants */
-    PHP_NCURSES_CONST(BUTTON1_PRESSED);
-    PHP_NCURSES_CONST(BUTTON1_RELEASED);
-    PHP_NCURSES_CONST(BUTTON1_CLICKED);
-    PHP_NCURSES_CONST(BUTTON1_DOUBLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON1_TRIPLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON2_PRESSED);
-    PHP_NCURSES_CONST(BUTTON2_RELEASED);
-    PHP_NCURSES_CONST(BUTTON2_CLICKED);
-    PHP_NCURSES_CONST(BUTTON2_DOUBLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON2_TRIPLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON3_PRESSED);
-    PHP_NCURSES_CONST(BUTTON3_RELEASED);
-    PHP_NCURSES_CONST(BUTTON3_CLICKED);
-    PHP_NCURSES_CONST(BUTTON3_DOUBLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON3_TRIPLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON4_PRESSED);
-    PHP_NCURSES_CONST(BUTTON4_RELEASED);
-    PHP_NCURSES_CONST(BUTTON4_CLICKED);
-    PHP_NCURSES_CONST(BUTTON4_DOUBLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON4_TRIPLE_CLICKED);
-    PHP_NCURSES_CONST(BUTTON_SHIFT);
-    PHP_NCURSES_CONST(BUTTON_CTRL);
-    PHP_NCURSES_CONST(BUTTON_ALT);
-    PHP_NCURSES_CONST(ALL_MOUSE_EVENTS);
-    PHP_NCURSES_CONST(REPORT_MOUSE_POSITION);
+	/* mouse constants */
+	PHP_NCURSES_CONST(BUTTON1_PRESSED);
+	PHP_NCURSES_CONST(BUTTON1_RELEASED);
+	PHP_NCURSES_CONST(BUTTON1_CLICKED);
+	PHP_NCURSES_CONST(BUTTON1_DOUBLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON1_TRIPLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON2_PRESSED);
+	PHP_NCURSES_CONST(BUTTON2_RELEASED);
+	PHP_NCURSES_CONST(BUTTON2_CLICKED);
+	PHP_NCURSES_CONST(BUTTON2_DOUBLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON2_TRIPLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON3_PRESSED);
+	PHP_NCURSES_CONST(BUTTON3_RELEASED);
+	PHP_NCURSES_CONST(BUTTON3_CLICKED);
+	PHP_NCURSES_CONST(BUTTON3_DOUBLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON3_TRIPLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON4_PRESSED);
+	PHP_NCURSES_CONST(BUTTON4_RELEASED);
+	PHP_NCURSES_CONST(BUTTON4_CLICKED);
+	PHP_NCURSES_CONST(BUTTON4_DOUBLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON4_TRIPLE_CLICKED);
+	PHP_NCURSES_CONST(BUTTON_SHIFT);
+	PHP_NCURSES_CONST(BUTTON_CTRL);
+	PHP_NCURSES_CONST(BUTTON_ALT);
+	PHP_NCURSES_CONST(ALL_MOUSE_EVENTS);
+	PHP_NCURSES_CONST(REPORT_MOUSE_POSITION);
 
-    le_ncurses_windows = zend_register_list_destructors_ex(ncurses_destruct_window, NULL, "ncurses_window", module_number);
+	ZEND_INIT_MODULE_GLOBALS(ncurses, php_ncurses_init_globals, NULL);
+
+	le_ncurses_windows = zend_register_list_destructors_ex(ncurses_destruct_window, NULL, "ncurses_window", module_number);
 #if HAVE_NCURSES_PANEL
-    le_ncurses_panels = zend_register_list_destructors_ex(ncurses_destruct_panel, NULL, "ncurses_panel", module_number);
+	le_ncurses_panels = zend_register_list_destructors_ex(ncurses_destruct_panel, NULL, "ncurses_panel", module_number);
 #endif
 
-    return SUCCESS;
+	return SUCCESS;
 }
 /* }}} */
 
@@ -260,7 +266,7 @@ PHP_MINIT_FUNCTION(ncurses)
  */
 PHP_MSHUTDOWN_FUNCTION(ncurses)
 {
-    return SUCCESS;
+	return SUCCESS;
 }
 /* }}} */
 
@@ -269,7 +275,7 @@ PHP_MSHUTDOWN_FUNCTION(ncurses)
  */
 PHP_RINIT_FUNCTION(ncurses)
 {
-    return SUCCESS;
+	return SUCCESS;
 }
 /* }}} */
 
@@ -278,7 +284,7 @@ PHP_RINIT_FUNCTION(ncurses)
  */
 PHP_RSHUTDOWN_FUNCTION(ncurses)
 {
-    return SUCCESS;
+	return SUCCESS;
 }
 /* }}} */
 
@@ -286,19 +292,19 @@ PHP_RSHUTDOWN_FUNCTION(ncurses)
  */
 PHP_MINFO_FUNCTION(ncurses)
 {
-    php_info_print_table_start();
-    php_info_print_table_header(2, "ncurses support", "enabled");
-    php_info_print_table_row(2, "ncurses library version", NCURSES_VERSION);
+	php_info_print_table_start();
+	php_info_print_table_header(2, "ncurses support", "enabled");
+	php_info_print_table_row(2, "ncurses library version", NCURSES_VERSION);
 #ifdef HAVE_NCURSES_COLOR_SET
 		php_info_print_table_row(2, "color support", "yes");
 #else
 		php_info_print_table_row(2, "color support", "no");
 #endif
-    php_info_print_table_end();
+	php_info_print_table_end();
 
-    /* Remove comments if you have entries in php.ini
-    DISPLAY_INI_ENTRIES();
-    */
+	/* Remove comments if you have entries in php.ini
+	DISPLAY_INI_ENTRIES();
+	*/
 }
 /* }}} */
 

ext/pgsql/pgsql.c

@@ -466,9 +466,9 @@ PHP_MINFO_FUNCTION(pgsql)
 #if HAVE_PG_CONFIG_H
 	php_info_print_table_row(2, "PostgreSQL(libpq) Version", PG_VERSION);
 #ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
-	php_info_print_table_row(2, "Multibyte charater support", "enabled");
+	php_info_print_table_row(2, "Multibyte character support", "enabled");
 #else
-	php_info_print_table_row(2, "Multibyte charater support", "disabled");
+	php_info_print_table_row(2, "Multibyte character support", "disabled");
 #endif
 #ifdef USE_SSL
 	php_info_print_table_row(2, "SSL support", "enabled");

ext/standard/array.c

@@ -1429,18 +1429,17 @@ PHP_FUNCTION(range)
 	array_init(return_value);
 
 	if (Z_TYPE_PP(zlow)==IS_STRING && Z_TYPE_PP(zhigh)==IS_STRING) {
-		char *low, *high;
-		convert_to_string_ex(zlow);
-		convert_to_string_ex(zhigh);
-		low = Z_STRVAL_PP(zlow);
-		high = Z_STRVAL_PP(zhigh);
-		if (*low>*high) {
-			for (; *low >= *high; (*low)--) {
-				add_next_index_stringl(return_value, low, 1, 1);
+		unsigned char low, high;
+		low = *((unsigned char *)Z_STRVAL_PP(zlow));
+		high = *((unsigned char *)Z_STRVAL_PP(zhigh));
+		
+		if (low>high) {
+			for (; low >= high; (low)--) {
+				add_next_index_stringl(return_value, (char *)&low, 1, 1);
 			}	
 		} else {
-			for (; *low <= *high; (*low)++) {
-				add_next_index_stringl(return_value, low, 1, 1);
+			for (; low <= high; (low)++) {
+				add_next_index_stringl(return_value, (char *)&low, 1, 1);
 			}	
 		}
 	} else {

ext/standard/credits.c

@@ -95,8 +95,8 @@ PHPAPI void php_print_credits(int flag)
 
 	if (flag & PHP_CREDITS_QA) {
 		php_info_print_table_start();
-		php_info_print_table_header(1, "PHP Quality Assurance Team");
-		php_info_print_table_row(1, "Andre Langhorst, Derick Rethans, Hellekin O. Wolf, Jalal Pushman, James Moore, Jani Taskinen, Joey Smith, Olivier Cahagne, Phil Driscoll, Sebastian Bergmann, Zak Greant");
+		php_info_print_table_header(1, "PHP 4.3 Quality Assurance Team");
+		php_info_print_table_row(1, "Ilia Alshanetsky, Stefan Esser, Moriyoshi Koizumi, Sebastian Nohn, Derick Rethans, Melvyn Sopacua, Jani Taskinen");
 		php_info_print_table_end();
 	}
 

ext/standard/credits_ext.h

@@ -30,7 +30,7 @@ CREDIT_LINE("FBSQL", "Frank M. Kromann");
 CREDIT_LINE("FDF", "Uwe Steinmann");
 CREDIT_LINE("FilePro", "Chad Robinson");
 CREDIT_LINE("FriBidi", "Onn Ben-Zvi, Tal Peer");
-CREDIT_LINE("FTP", "Andrew Skalski");
+CREDIT_LINE("FTP", "Stefan Esser, Andrew Skalski");
 CREDIT_LINE("GD imaging", "Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni Ahto");
 CREDIT_LINE("GetText", "Alex Plotnick");
 CREDIT_LINE("GNU GMP support", "Stanislav Malyshev");
@@ -55,7 +55,7 @@ CREDIT_LINE("mSQL", "Zeev Suraski");
 CREDIT_LINE("MS SQL", "Frank M. Kromann");
 CREDIT_LINE("Multibyte (Japanese) String Functions", "Tsukada Takuya, Rui Hirokawa");
 CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
-CREDIT_LINE("ncurses", "Hartmut Holzgraefe");
+CREDIT_LINE("ncurses", "Ilia Alshanetsky, Hartmut Holzgraefe, Georg Richter");
 CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson");
 CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky");
 CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler");

ext/standard/dir.c

@@ -400,6 +400,9 @@ PHP_FUNCTION(glob)
 
 	/* we assume that any glob pattern will match files from one directory only
 	   so checking the dirname of the first match should be sufficient */
+	if (!globbuf.gl_pathv) {
+		RETURN_FALSE;
+	}
 	strncpy(cwd, globbuf.gl_pathv[0], MAXPATHLEN);
 	if (PG(safe_mode) && (!php_checkuid(cwd, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
 		RETURN_FALSE;

ext/standard/file.c

@@ -273,14 +273,9 @@ PHP_FUNCTION(get_meta_tags)
 		return;
 	}
 
-	php_stream_open_wrapper(filename, "rb", 0, NULL);
-
-	
 	md.stream = php_stream_open_wrapper(filename, "rb",
 			(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS,
 			NULL);
-	
-
 
 	if (!md.stream)	{
 		RETURN_FALSE;

ext/standard/flock_compat.c

@@ -25,6 +25,7 @@
 #if HAVE_STRUCT_FLOCK
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/file.h>
 #endif
 
 #ifdef PHP_WIN32

ext/standard/string.c

@@ -1352,6 +1352,9 @@ PHP_FUNCTION(stristr)
 	if (Z_TYPE_PP(needle) == IS_STRING) {
 		if (!Z_STRLEN_PP(needle)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
+			efree(haystack_orig);
+			zval_ptr_dtor(haystack);
+			zval_ptr_dtor(needle);
 			RETURN_FALSE;
 		}
 
@@ -1372,6 +1375,8 @@ PHP_FUNCTION(stristr)
 		RETVAL_FALSE;
 	}
 
+	zval_ptr_dtor(haystack);
+	zval_ptr_dtor(needle);
 	efree(haystack_orig);
 }
 /* }}} */

ext/standard/tests/array/bug21182.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Bug #21182 (range modifies arguments)
+--FILE--
+<?php
+$a = "20"; $b = "30";
+echo "a1: $a\n";
+$result = range($a, $b);
+echo "a2: $a : type : " . gettype($a) . "\n";
+?>
+--EXPECT--
+a1: 20
+a2: 20 : type : string

ext/standard/tests/file/bug21131.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Bug #21131: fopen($filename, "a+") has broken position
+--FILE--
+<?php # vim600:syn=php:
+$filename = tempnam("/tmp", "phpt");
+
+$fp = fopen($filename, "w") or die("can't open $filename for append");
+fwrite($fp, "foobar");
+fclose($fp);
+
+$fp = fopen($filename, "a+");
+var_dump(ftell($fp));
+rewind($fp);
+var_dump(ftell($fp));
+fpassthru($fp);
+fclose($fp);
+unlink($filename);
+?>
+--EXPECT--
+int(6)
+int(0)
+foobar
+

ext/standard/tests/file/userstreams.phpt

@@ -97,7 +97,11 @@ class mystream
 
 		$split = parse_url($path);
 		$this->varname = $split["host"];
-		$this->position = 0;
+
+		if (strchr($mode, 'a'))
+			$this->position = strlen($GLOBALS[$this->varname]);
+		else
+			$this->position = 0;
 		
 		return true;
 	}
@@ -301,6 +305,15 @@ while(!feof($fp)) {
 if ($fail_count == 0) {
 	echo "FGETS: OK\n";
 }
+
+/* One final test to see if the position is respected when opened for append */
+$fp = fopen("test://lyrics", "a+");
+rewind($fp);
+var_dump(ftell($fp));
+$data = fgets($fp);
+fclose($fp);
+echo $data . "\n";
+
 ?>
 --EXPECT--
 Not Registered
@@ -308,3 +321,5 @@ Registered
 Registered
 SEEK: OK
 FGETS: OK
+int(0)
+...and the road becomes my bride

main/config.w32.h.in

@@ -75,6 +75,9 @@
 /* Enable / Disable XML extension (default: enabled) */
 #define HAVE_LIBEXPAT 1
 
+/* Enable / Disable ZLIB extension (default: enabled) */
+#define HAVE_ZLIB 1
+
 /* PHP Runtime Configuration */
 #define FORCE_CGI_REDIRECT 1
 #define PHP_URL_FOPEN 1

main/fopen_wrappers.c

@@ -348,8 +348,8 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
 		fp = NULL;
 	}
 	if (!fp) {
+		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unable to open %s", filename); 
 		STR_FREE(SG(request_info).path_translated);	/* for same reason as above */
-		SG(request_info).path_translated = NULL;
 		return FAILURE;
 	}
 

main/internal_functions_win32.c

@@ -90,6 +90,9 @@
 #if HAVE_TOKENIZER
 #include "ext/tokenizer/php_tokenizer.h"
 #endif
+#if HAVE_ZLIB
+#include "ext/zlib/php_zlib.h"
+#endif
 /* }}} */
 
 /* {{{ php_builtin_extensions[]
@@ -140,6 +143,9 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_LIBEXPAT && HAVE_WDDX
 	,phpext_wddx_ptr
 #endif
+#if HAVE_ZLIB
+	,phpext_zlib_ptr
+#endif
 };
 /* }}} */
 

main/network.c

@@ -100,9 +100,11 @@ int inet_aton(const char *, struct in_addr *);
 #ifdef PHP_WIN32
 # define SOCK_ERR INVALID_SOCKET
 # define SOCK_CONN_ERR SOCKET_ERROR
+# define PHP_TIMEOUT_ERROR_VALUE		WSAETIMEDOUT
 #else
 # define SOCK_ERR -1
 # define SOCK_CONN_ERR -1
+# define PHP_TIMEOUT_ERROR_VALUE		ETIMEDOUT
 #endif
 
 #ifdef HAVE_GETADDRINFO
@@ -266,6 +268,7 @@ PHPAPI int php_connect_nonb(int sockfd,
 	int ret = 0;
 	fd_set rset;
 	fd_set wset;
+	fd_set eset;
 
 	if (timeout == NULL)	{
 		/* blocking mode */
@@ -286,11 +289,13 @@ PHPAPI int php_connect_nonb(int sockfd,
 	}
 
 	FD_ZERO(&rset);
+	FD_ZERO(&eset);
 	FD_SET(sockfd, &rset);
+	FD_SET(sockfd, &eset);
 
 	wset = rset;
 
-	if ((n = select(sockfd + 1, &rset, &wset, NULL, timeout)) == 0) {
+	if ((n = select(sockfd + 1, &rset, &wset, &eset, timeout)) == 0) {
 		error = ETIMEDOUT;
 	}
 
@@ -400,9 +405,7 @@ int php_hostconnect(const char *host, unsigned short port, int socktype, struct
 	struct sockaddr **sal, **psal;
 	struct timeval individual_timeout;
 	int set_timeout = 0;
-#ifdef PHP_WIN32
 	int err;
-#endif
 	
 	n = php_network_getaddresses(host, &sal TSRMLS_CC);
 
@@ -463,10 +466,19 @@ int php_hostconnect(const char *host, unsigned short port, int socktype, struct
 #ifdef PHP_WIN32
 			/* Preserve the last error */
 			err = WSAGetLastError();
+#else
+			err = errno;
 #endif
 			close (s);
 		}
 		sal++;
+
+		if (err == PHP_TIMEOUT_ERROR_VALUE) {
+			/* if the first attempt timed out, it's highly likely
+			 * that any subsequent attempts will do so also */
+			break;
+		}
+		
 	}
 	php_network_freeaddresses(psal);
 	php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_hostconnect: connect failed");

main/php_version.h

@@ -2,6 +2,6 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 4
 #define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "RC4"
-#define PHP_VERSION "4.3.0RC4"
+#define PHP_RELEASE_VERSION 1
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "4.3.1"

main/streams.c

@@ -1317,8 +1317,12 @@ PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STRE
 	
 	stream = php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode);
 
-	if (stream && self->is_pipe) {
-		stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
+	if (stream) {
+		if (self->is_pipe) {
+			stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
+		} else {
+			stream->position = ftell(file);
+		}
 	}
 
 	return stream;
@@ -2412,6 +2416,16 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
 				}
 		}
 	}
+
+	if (stream && stream->ops->seek && (stream->flags & PHP_STREAM_FLAG_NO_SEEK) == 0 && strchr(mode, 'a')) {
+		off_t newpos = 0;
+
+		/* if opened for append, we need to revise our idea of the initial file position */
+		if (0 == stream->ops->seek(stream, 0, SEEK_CUR, &newpos TSRMLS_CC)) {
+			stream->position = newpos;
+		}
+	}
+	
 	if (stream == NULL && (options & REPORT_ERRORS)) {
 		display_wrapper_errors(wrapper, path, "failed to create stream" TSRMLS_CC);
 	}

pear/PEAR/Config.php

@@ -149,7 +149,7 @@ if (isset($_ENV['PHP_PEAR_UMASK'])) {
 if (isset($_ENV['PHP_PEAR_CACHE_TTL'])) {
     define('PEAR_CONFIG_DEFAULT_CACHE_TTL', $_ENV['PHP_PEAR_CACHE_TTL']);
 } else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 0);
+    define('PEAR_CONFIG_DEFAULT_CACHE_TTL', 3600);
 }
 
 // Default for sig_type
@@ -1136,4 +1136,4 @@ class PEAR_Config extends PEAR
     // }}}
 }
 
-?>
+?>

pear/System.php

@@ -419,17 +419,25 @@ class System
     */
     function which($program, $fallback = false)
     {
+    	// is_executable() is not available on windows
+    	if (OS_WINDOWS) {
+            $pear_is_executable = 'is_file';
+        } else {
+            $pear_is_executable = 'is_executable';
+        }
+
         // full path given
         if (basename($program) != $program) {
-            return (@is_executable($program)) ? $program : $fallback;
+            return (@$pear_is_executable($program)) ? $program : $fallback;
         }
+
         // XXX FIXME honor safe mode
         $path_delim = OS_WINDOWS ? ';' : ':';
         $exe_suffix = OS_WINDOWS ? '.exe' : '';
         $path_elements = explode($path_delim, getenv('PATH'));
         foreach ($path_elements as $dir) {
             $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
-            if (@is_file($file) && @is_executable($file)) {
+            if (@is_file($file) && @$pear_is_executable($file)) {
                 return $file;
             }
         }

php.ini-dist

@@ -519,37 +519,36 @@ default_socket_timeout = 60
 ;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
-;extension=php_ctype.dll
 ;extension=php_cpdf.dll
 ;extension=php_crack.dll
 ;extension=php_curl.dll
-;extension=php_cybercash.dll
 ;extension=php_db.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
 ;extension=php_domxml.dll
-;extension=php_dotnet.dll
 ;extension=php_exif.dll
 ;extension=php_fbsql.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
 ;extension=php_gd.dll
+;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_hyperwave.dll
 ;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll
-;extension=php_ingres.dll
 ;extension=php_interbase.dll
 ;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
+;extension=php_mime_magic.dll
 ;extension=php_ming.dll
 ;extension=php_mssql.dll
+;extension=php_msql.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll
@@ -560,11 +559,11 @@ default_socket_timeout = 60
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
-;extension=php_tokenizer.dll
 ;extension=php_w32api.dll
+;extension=php_xmlrpc.dll
 ;extension=php_xslt.dll
 ;extension=php_yaz.dll
-;extension=php_zlib.dll
+;extension=php_zip.dll
 
 
 ;;;;;;;;;;;;;;;;;;;

php.ini-recommended

@@ -534,37 +534,36 @@ default_socket_timeout = 60
 ;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
 ;
 ;extension=php_bz2.dll
-;extension=php_ctype.dll
 ;extension=php_cpdf.dll
 ;extension=php_crack.dll
 ;extension=php_curl.dll
-;extension=php_cybercash.dll
 ;extension=php_db.dll
 ;extension=php_dba.dll
 ;extension=php_dbase.dll
 ;extension=php_dbx.dll
 ;extension=php_domxml.dll
-;extension=php_dotnet.dll
 ;extension=php_exif.dll
 ;extension=php_fbsql.dll
 ;extension=php_fdf.dll
 ;extension=php_filepro.dll
 ;extension=php_gd.dll
+;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_hyperwave.dll
 ;extension=php_iconv.dll
 ;extension=php_ifx.dll
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll
-;extension=php_ingres.dll
 ;extension=php_interbase.dll
 ;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
 ;extension=php_mhash.dll
+;extension=php_mime_magic.dll
 ;extension=php_ming.dll
 ;extension=php_mssql.dll
+;extension=php_msql.dll
 ;extension=php_oci8.dll
 ;extension=php_openssl.dll
 ;extension=php_oracle.dll
@@ -575,11 +574,11 @@ default_socket_timeout = 60
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
-;extension=php_tokenizer.dll
 ;extension=php_w32api.dll
+;extension=php_xmlrpc.dll
 ;extension=php_xslt.dll
 ;extension=php_yaz.dll
-;extension=php_zlib.dll
+;extension=php_zip.dll
 
 
 ;;;;;;;;;;;;;;;;;;;

sapi/apache/mod_php4.c

@@ -415,7 +415,7 @@ static void init_request_info(TSRMLS_D)
 		authorization = table_get(r->headers_in, "Authorization");
 	}
 	if (authorization
-		&& !auth_type(r)
+		&& (!PG(safe_mode) || (PG(safe_mode) && !auth_type(r)))
 		&& !strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) {
 		tmp = uudecode(r->pool, authorization);
 		SG(request_info).auth_user = getword_nulls_nc(r->pool, &tmp, ':');

sapi/apache2filter/sapi_apache2.c

@@ -369,8 +369,13 @@ static void php_apache_request_ctor(ap_filter_t *f, php_struct *ctx TSRMLS_DC)
 	apr_table_unset(f->r->headers_out, "Expires");
 	apr_table_unset(f->r->headers_out, "ETag");
 	apr_table_unset(f->r->headers_in, "Connection");
-	auth = apr_table_get(f->r->headers_in, "Authorization");
-	php_handle_auth_data(auth TSRMLS_CC);
+	if (!PG(safe_mode)) {
+		auth = apr_table_get(f->r->headers_in, "Authorization");
+		php_handle_auth_data(auth TSRMLS_CC);
+	} else {
+		SG(request_info).auth_user = NULL;
+		SG(request_info).auth_password = NULL;
+	}
 
 	php_request_startup(TSRMLS_C);
 }

sapi/cgi/cgi_main.c

@@ -121,7 +121,7 @@ extern int ap_php_optind;
 
 #if ENABLE_PATHINFO_CHECK
 /* true global.  this is retreived once only, even for fastcgi */
-int fix_pathinfo=1;
+long fix_pathinfo=1;
 #endif
 
 #ifdef PHP_WIN32
@@ -265,6 +265,9 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 	zend_llist_position pos;
 	long rfc2616_headers = 0;
 
+	if(SG(request_info).no_headers == 1) {
+		return  SAPI_HEADER_SENT_SUCCESSFULLY;
+	}
 	/* Check wheater to send RFC2616 style headers compatible with
 	 * PHP versions 4.2.3 and earlier compatible with web servers
 	 * such as IIS. Default is informal CGI RFC header compatible 
@@ -1379,6 +1382,10 @@ consult the installation file that came with this distribution, or visit \n\
             php_module_shutdown(TSRMLS_C);
             return FAILURE;
         }
+		if (no_headers) {
+			SG(headers_sent) = 1;
+			SG(request_info).no_headers = 1;
+		}
 
         /* This actually destructs the elements of the list - ugly hack */
         zend_llist_apply(&global_vars, (llist_apply_func_t) php_register_command_line_global_vars TSRMLS_CC);

tests/lang/bug20993.phpt

@@ -1,23 +0,0 @@
---TEST--
-Bug #20993 (referenced array key, makes array global)
---FILE--
-<?php
-$a = array(1);
-$b = array(1);
-$ref =& $a[0];
-
-echo $a[0], ' -b ', $b[0], ' -r ', $ref,  "\n";
-changeVal($a);
-echo $a[0], ' -b ', $b[0], ' -r ', $ref,  "\n";
-changeVal($b);
-echo $a[0], ' -b ', $b[0], ' -r ', $ref,  "\n";
-
-function changeVal($arr)
-{
-	$arr[0] = 2;
-}
-?>
---EXPECT--
-1 -b 1 -r 1
-1 -b 1 -r 1
-1 -b 1 -r 1

win32/php4dllts.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 /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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_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 /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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"
+# 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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"
 
@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib 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 /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline"
+# 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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline"
 
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # 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 /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"
-# 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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg"
+# 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 ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg"
 
 !ENDIF 
 
@@ -1907,6 +1907,30 @@ SOURCE=..\ext\standard\url_scanner_ex.h
 # End Source File
 # End Group
 # End Group
+# Begin Group "zlib"
+
+# PROP Default_Filter ""
+# Begin Group "Source Files No. 10"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\ext\zlib\zlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\zlib\zlib_fopen_wrapper.c
+# End Source File
+# End Group
+# Begin Group "Header Files No. 10"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\ext\zlib\php_zlib.h
+# End Source File
+# End Group
+# End Group
 # End Group
 # Begin Group "Win32"
 

win32/php4ts_cli.dsp

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\php.exe" /libpath:"..\Release_TS"
+# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS\cli\php.exe" /libpath:"..\Release_TS"
 
 !ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Debug_TS"
 
@@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\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 php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug_TS\cli\php.exe" /pdbtype:sept /libpath:"..\Debug_TS"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Release_TS_inline"
@@ -106,7 +106,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:3.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"Release_TS\php.exe" /libpath:"Release_TS"
-# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\php.exe" /libpath:"..\Release_TS_inline"
+# ADD LINK32 php4ts.lib winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\Release_TS_inline\cli\php.exe" /libpath:"..\Release_TS_inline"
 
 !ELSEIF  "$(CFG)" == "php4ts_cli - Win32 Release_TSDbg"