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

ChangeLog

@@ -1,166 +1,3 @@
-2004-07-14  Edin Kadribasic  <edink@emini.dk>
-
-    * (PHP_4_3)
-      sapi/cgi/cgi_main.c
-      sapi/cli/php_cli.c:
-      MFH: Made php -m output sorted case-insensitevly
-
-    * sapi/cgi/cgi_main.c
-      sapi/cli/php_cli.c:
-      Made php -m output sorted case-insensitevly
-
-2004-07-14  Stefan Esser  <sesser@suspekt.org>
-
-    * (PHP_4_3)
-      ext/standard/tests/strings/strip_tags.phpt:
-      Ups... CAN-2004-0595 regression test went into wrong branch...
-
-    * (PHP_4_3_7)
-      ext/standard/tests/strings/strip_tags.phpt:
-      Add CAN-2004-0595 regression test. (modified from Joe Ortons version)
-
-    * sapi/apache_hooks/mod_php5.c:
-      same bug.
-
-2004-07-14  Derick Rethans  <php@derickrethans.nl>
-
-    * ext/iconv/config.m4:
-      - Fixed text.
-
-2004-07-14  Stefan Esser  <sesser@suspekt.org>
-
-    * sapi/apache/mod_php5.c:
-      Security Fix broken! Destroyed Basic auth. Blame: me
-      4.3.x not affected
-
-2004-07-14  Stanislav Malyshev  <stas@zend.com>
-
-    * ZendEngine2/zend_object_handlers.c:
-      be consistent with write_dimension
-
-    * ZendEngine2/zend_object_handlers.c:
-      fix #28957
-
-2004-07-14  Sara Golemon  <php@alphaweb.net>
-
-    * NEWS
-      ext/bcmath/bcmath.c
-      ext/bcmath/php_bcmath.h:
-      Bugfix# 28829 bcmath values for 0, 1, and 2 initialized/freed at wrong time
-      for threaded sapis.
-
-2004-07-13  Andi Gutmans  <andi@zend.com>
-
-    * NEWS
-      configure.in
-      ZendEngine2/zend.h
-      main/php_version.h:
-      - 5.0.1-dev
-
-2004-07-13  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
-
-    * (PHP_4_3)
-      NEWS
-      NEWS:
-      BFN
-
-    * ZendEngine2/zend_constants.c:
-      Bugfix #29116 Zend constant warning uses memory after free (jdolecek at
-      NetBSD dot org)
-
-2004-07-13  Andi Gutmans  <andi@zend.com>
-
-    * (php_5_0_0)
-      NEWS
-      configure.in
-      ZendEngine2/zend.h
-      main/php_version.h:
-      - Roll PHP 5.0.0
-
-2004-07-13  Wez Furlong  <wez.php@thebrainroom.net>
-
-    * (php_5_0_0)
-      ext/standard/html.c:
-      add missing break
-
-2004-07-13  Georg Richter  <georg@mysql.com>
-
-    * (php_5_0_0)
-      ext/mysqli/mysqli_api.c:
-      prototype fixes
-
-2004-07-13  Wez Furlong  <wez.php@thebrainroom.net>
-
-    * (php_5_0_0)
-      main/streams/streams.c:
-      Looks like Sara forgot to change this too.
-
-2004-07-13  Georg Richter  <georg@mysql.com>
-
-    * ext/mysqli/mysqli_api.c:
-      changed mysqli_stmt_reset (returns now bool instead of void)
-
-2004-07-13  Ilia Alshanetsky  <ilia@prohost.org>
-
-    * (PHP_4_3_7)
-      NEWS
-      configure.in
-      Zend/zend_alloc.c
-      Zend/zend_constants.c
-      Zend/zend_execute.c
-      Zend/zend_hash.c
-      Zend/zend_variables.c
-      ext/imap/php_imap.c
-      ext/msession/msession.c
-      ext/mssql/php_mssql.c
-      ext/mysql/php_mysql.c
-      ext/pcntl/pcntl.c
-      ext/session/mod_mm.c
-      ext/session/session.c
-      ext/standard/ftok.c
-      ext/standard/iptc.c
-      ext/standard/string.c
-      ext/sybase/php_sybase_db.c
-      ext/sybase_ct/php_sybase_ct.c
-      ext/w32api/w32api.c
-      ext/wddx/wddx.c
-      main/main.c
-      main/php_version.h
-      main/rfc1867.c:
-      4.3.8 patches.
-
-2004-07-13  Derick Rethans  <php@derickrethans.nl>
-
-    * (PHP_4_3_7)
-      main/php_version.h:
-      - Fixed typo
-
-    * (PHP_4_3)
-      configure.in
-      main/php_version.h:
-      - Bump version numbers in the PHP_4_3 branch.
-
-    * (PHP_4_3_7)
-      configure.in
-      main/php_version.h:
-      - Create a branch PHP_4_3_7 based on php 4.3.7 to form 4.3.8
-      - Updated version numbers in branch
-
-2004-07-13  Stefan Esser  <sesser@suspekt.org>
-
-    * (php_5_0_0)
-      tests/lang/038.phpt:
-      Fixed typo
-
-2004-07-13  Alan Knowles  <alan@akbkhome.com>
-
-    * (php_5_0_0)
-      tests/lang/039.phpt:
-      remove test dependance on postgres ** this still fails however
-
-    * tests/lang/038.phpt:
-      ensure that test passes on systems without postgres built in.
-
 2004-07-12  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (PHP_4_3)

NEWS

@@ -1,8 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2004, PHP 5.0.1
-- Fixed bug #28829 (Thread-unsafety in bcmath elementary values). (Sara)
-
 13 Jul 2004, PHP 5.0.0
 - Updated PCRE to provide better error handling in certain cases. (Andrei)
 - Changed doc comments to require a single white space after '/**'. (Marcus)

Zend/ChangeLog

@@ -1,28 +1,3 @@
-2004-07-14  Stanislav Malyshev  <stas@zend.com>
-
-    * zend_object_handlers.c:
-      be consistent with write_dimension
-
-    * zend_object_handlers.c:
-      fix #28957
-
-2004-07-13  Andi Gutmans  <andi@zend.com>
-
-    * zend.h:
-      - 5.0.1-dev
-
-2004-07-13  Marcus Boerger  <marcus.boerger@post.rwth-aachen.de>
-
-    * zend_constants.c:
-      Bugfix #29116 Zend constant warning uses memory after free (jdolecek at
-      NetBSD dot org)
-
-2004-07-13  Andi Gutmans  <andi@zend.com>
-
-    * (php_5_0_0)
-      zend.h:
-      - Roll PHP 5.0.0
-
 2004-07-12  Ilia Alshanetsky  <ilia@prohost.org>
 
     * (php_5_0_0RC4)

Zend/zend.h

@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.0.1-dev"
+#define ZEND_VERSION "2.0.0"
 
 #define ZEND_ENGINE_2
 

Zend/zend_constants.c

@@ -317,11 +317,11 @@ ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC)
 	}
 
 	if (zend_hash_add(EG(zend_constants), name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
-		zend_error(E_NOTICE,"Constant %s already defined", name);
 		free(c->name);
 		if (!(c->flags & CONST_PERSISTENT)) {
 			zval_dtor(&c->value);
 		}
+		zend_error(E_NOTICE,"Constant %s already defined", name);
 		ret = FAILURE;
 	}
 	if (lowercase_name) {

Zend/zend_dynamic_array.h

@@ -30,7 +30,7 @@ typedef struct _dynamic_array {
 } dynamic_array;
 
 BEGIN_EXTERN_C()
-ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size);
+ZEND_API int zend_dynamic_array_init(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_push(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_pop(dynamic_array *da);
 ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index);

Zend/zend_object_handlers.c

@@ -381,14 +381,7 @@ zval *zend_std_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
 	zval *retval;
 	
 	if (instanceof_function_ex(ce, zend_ce_arrayaccess, 1 TSRMLS_CC)) {
-		if(offset == NULL) {
-			/* [] construct */
-			zval offset_null;
-			INIT_ZVAL(offset_null);
-			offset = &offset_null;
-		}
 		zend_call_method_with_1_params(&object, ce, NULL, "offsetget", &retval, offset);
-
 		if (!retval) {
 			if (!EG(exception)) {
 				zend_error(E_ERROR, "Undefined offset for object of type %s used as array", ce->name);

configure.in

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

ext/bcmath/bcmath.c

@@ -53,8 +53,8 @@ zend_module_entry bcmath_module_entry = {
 	bcmath_functions,
 	PHP_MINIT(bcmath),
 	PHP_MSHUTDOWN(bcmath),
-	PHP_RINIT(bcmath),
-	PHP_RSHUTDOWN(bcmath),
+	NULL,
+	NULL,
 	PHP_MINFO(bcmath),
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
@@ -86,6 +86,8 @@ PHP_MINIT_FUNCTION(bcmath)
 
 	REGISTER_INI_ENTRIES();
 
+	bc_init_numbers(TSRMLS_C);
+
 	return SUCCESS;
 }
 /* }}} */
@@ -94,33 +96,15 @@ PHP_MINIT_FUNCTION(bcmath)
  */
 PHP_MSHUTDOWN_FUNCTION(bcmath)
 {
+	_bc_free_num_ex(&BCG(_zero_), 1);
+	_bc_free_num_ex(&BCG(_one_), 1);
+	_bc_free_num_ex(&BCG(_two_), 1);
+
 	UNREGISTER_INI_ENTRIES();
 
 	return SUCCESS;
 }
 /* }}} */
-
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(bcmath)
-{
-	bc_init_numbers(TSRMLS_C);
-
-	return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(bcmath)
-{
-	_bc_free_num_ex(&BCG(_zero_), 1);
-	_bc_free_num_ex(&BCG(_one_), 1);
-	_bc_free_num_ex(&BCG(_two_), 1);
-
-	return SUCCESS;
-}
-/* }}} */	
          
 /* {{{ PHP_MINFO_FUNCTION
  */

ext/bcmath/php_bcmath.h

@@ -30,8 +30,6 @@ extern zend_module_entry bcmath_module_entry;
 
 PHP_MINIT_FUNCTION(bcmath);
 PHP_MSHUTDOWN_FUNCTION(bcmath);
-PHP_RINIT_FUNCTION(bcmath);
-PHP_RSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
 PHP_FUNCTION(bcadd);

ext/iconv/config.m4

@@ -3,7 +3,7 @@ dnl $Id$
 dnl
 
 PHP_ARG_WITH(iconv, for iconv support,
-[  --without-iconv[=DIR]   Exclude iconv support], yes)
+[  --without-iconv[=DIR]   Include iconv support], yes)
 
 if test "$PHP_ICONV" != "no"; then
 

ext/oci8/oci8.c

@@ -2673,13 +2673,13 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
 	smart_str_0(&hashed_details);
 
 	if (!exclusive) {
-		mutex_lock(mx_lock);
 		if (zend_ts_hash_find(persistent_sessions, hashed_details.c, hashed_details.len+1, (void **) &session_list) != SUCCESS) {
 			zend_llist tmp;
 			/* first session, set up a session list */
 			zend_llist_init(&tmp, sizeof(oci_session), (llist_dtor_func_t) _session_pcleanup, 1);
 			zend_ts_hash_update(persistent_sessions, hashed_details.c, hashed_details.len+1, &tmp, sizeof(zend_llist), (void **) &session_list);
 		} else {
+			mutex_lock(mx_lock);
 
 			/* session list found, search for an idle session or an already opened session by the current thread */
 			session = zend_llist_get_first(session_list);
@@ -2692,6 +2692,7 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
 				session->thread = thread_id();
 			}
 
+			mutex_unlock(mx_lock);
 		}
 
 		if (session) {
@@ -2706,7 +2707,6 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
 				/* breakthru to open */
 			}
 		}
-		mutex_unlock(mx_lock);
 	}
 
 	session = ecalloc(1,sizeof(oci_session));

ext/odbc/php_odbc.c

@@ -3038,7 +3038,7 @@ PHP_FUNCTION(odbc_foreignkeys)
 		fschema = Z_STRVAL_PP(pv_fschema);
 		convert_to_string_ex(pv_ftable);
 		ftable = Z_STRVAL_PP(pv_ftable);
-#if defined(HAVE_DBMAKER) || defined (HAVE_IBMDB2)
+#ifdef HAVE_DBMAKER
 #define EMPTY_TO_NULL(xstr) \
 	if ((int)strlen((xstr)) == 0) (xstr) = NULL
 

ext/soap/soap.c

@@ -624,8 +624,7 @@ PHP_FUNCTION(soap_encode_to_zval)
 }
 #endif
 
-/* {{{ proto object SoapParam::SoapParam ( mixed data, string name)
-   SoapParam constructor */
+/* SoapParam functions */
 PHP_METHOD(SoapParam, SoapParam)
 {
 	zval *data;
@@ -642,11 +641,8 @@ PHP_METHOD(SoapParam, SoapParam)
 	add_property_stringl(this_ptr, "param_name", name, name_length, 1);
 	add_property_zval(this_ptr, "param_data", data);
 }
-/* }}} */
 
-
-/* {{{ proto object SoapHeader::SoapHeader ( string namespace, string name [, mixed data [, bool mustUnderstand [, mixed actor]]])
-   SoapHeader constructor */
+/* SoapHeader functions */
 PHP_METHOD(SoapHeader, SoapHeader)
 {
 	zval *data = NULL, *actor = NULL;
@@ -677,8 +673,7 @@ PHP_METHOD(SoapHeader, SoapHeader)
 	}
 }
 
-/* {{{ proto object SoapFault::SoapFault ( string faultcode, string faultstring [, string faultactor [, mixed detail [, string faultname [, mixed headerfault]]]])
-   SoapFault constructor */
+/* SoapFault functions */
 PHP_METHOD(SoapFault, SoapFault)
 {
 	char *fault_string = NULL, *fault_code = NULL, *fault_actor = NULL, *name = NULL;
@@ -698,12 +693,8 @@ PHP_METHOD(SoapFault, SoapFault)
 		add_property_zval(this_ptr, "headerfault", headerfault);
 	}
 }
-/* }}} */
-
 
 #ifdef ZEND_ENGINE_2
-/* {{{ proto object SoapFault::SoapFault ( string faultcode, string faultstring [, string faultactor [, mixed detail [, string faultname [, mixed headerfault]]]])
-   SoapFault constructor */
 PHP_METHOD(SoapFault, __toString)
 {
 	zval *faultcode, *faultstring, *file, *line, *trace;
@@ -739,11 +730,9 @@ PHP_METHOD(SoapFault, __toString)
 
 	RETURN_STRINGL(str, len, 0);
 }
-/* }}} */
 #endif
 
-/* {{{ proto object SoapVar::SoapVar ( mixed data, int encoding [, string type_name [, string type_namespace [, string node_name [, string node_namespace]]]])
-   SoapVar constructor */
+/* SoapVar functions */
 PHP_METHOD(SoapVar, SoapVar)
 {
 	zval *data, *type;
@@ -784,11 +773,8 @@ PHP_METHOD(SoapVar, SoapVar)
 		add_property_stringl(this_ptr, "enc_namens", namens, namens_len, 1);
 	}
 }
-/* }}} */
 
-
-/* {{{ proto object SoapServer::SoapServer ( mixed wsdl [, array options])
-   SoapServer constructor */
+/* SoapServer functions */
 PHP_METHOD(SoapServer, SoapServer)
 {
 	soapServicePtr service;
@@ -863,8 +849,6 @@ PHP_METHOD(SoapServer, SoapServer)
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
-
 
 #define NULL_OR_STRING(zval) \
 	(!zval || Z_TYPE_P(zval) == IS_NULL || Z_TYPE_P(zval) == IS_STRING)
@@ -986,9 +970,6 @@ PHP_FUNCTION(PHP_SOAP_SERVER_CLASS, map)
 }
 #endif
 
-
-/* {{{ proto object SoapServer::SoapServer ( mixed wsdl [, array options])
-   Sets persistence mode of SoapServer */
 PHP_METHOD(SoapServer, setPersistence)
 {
 	soapServicePtr service;
@@ -1013,11 +994,7 @@ PHP_METHOD(SoapServer, setPersistence)
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
-
-/* {{{ proto void SoapServer::setClass(string class_name [, mixed args])
-   Sets class which will handle SOAP requests */
 PHP_METHOD(SoapServer, setClass)
 {
 	soapServicePtr service;
@@ -1077,11 +1054,7 @@ PHP_METHOD(SoapServer, setClass)
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
-
-/* {{{ proto array SoapServer::getFunctions(void)
-   Returns list of defined functions */
 PHP_METHOD(SoapServer, getFunctions)
 {
 	soapServicePtr  service;
@@ -1119,11 +1092,7 @@ PHP_METHOD(SoapServer, getFunctions)
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
-
-/* {{{ proto void SoapServer::addFunction(mixed functions)
-   Adds one or several functions those will handle SOAP requests */
 PHP_METHOD(SoapServer, addFunction)
 {
 	soapServicePtr service;
@@ -1213,11 +1182,7 @@ PHP_METHOD(SoapServer, addFunction)
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
-
-/* {{{ proto void SoapServer::handle ( [string soap_request])
-   Handles a SOAP request */
 PHP_METHOD(SoapServer, handle)
 {
 	int soap_version, old_soap_version;
@@ -1666,11 +1631,7 @@ fail:
 
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
-
-/* {{{ proto SoapServer::fault
-   SoapServer::fault */
 PHP_METHOD(SoapServer, fault)
 {
 	char *code, *string, *actor=NULL, *name=NULL;
@@ -1688,7 +1649,6 @@ PHP_METHOD(SoapServer, fault)
 	soap_server_fault(code, string, actor, details, name TSRMLS_CC);
 	SOAP_SERVER_END_CODE();
 }
-/* }}} */
 
 static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeader *hdr TSRMLS_DC)
 {
@@ -1826,9 +1786,9 @@ PHP_FUNCTION(is_soap_fault)
 }
 
 /* SoapClient functions */
-
-/* {{{ proto object SoapClient::SoapClient ( mixed wsdl [, array options])
-   SoapClient constructor */
+/*
+	SoapClient($wsdl, $options=array())
+*/
 PHP_METHOD(SoapClient, SoapClient)
 {
 
@@ -1961,14 +1921,13 @@ PHP_METHOD(SoapClient, SoapClient)
 
 	SOAP_CLIENT_END_CODE();
 }
-/* }}} */
 
 static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *action, int version, zval *response TSRMLS_DC)
 {
-	int    ret = TRUE;
-	char  *buf;
-	int    buf_size;
-	zval   func, param0, param1, param2, param3;
+  int    ret = TRUE;
+  char  *buf;
+  int    buf_size;
+  zval   func, param0, param1, param2, param3;
 	zval  *params[4];
 	zval **trace;
 	zval **fault;
@@ -2164,9 +2123,6 @@ static void do_soap_call(zval* this_ptr,
 	SOAP_CLIENT_END_CODE();
 }
 
-
-/* {{{ proto mixed SoapClient::__call ( string function_name [, array arguments [, array options [, array input_headers [, array output_headers]]]])
-   Calls a SOAP function */
 PHP_METHOD(SoapClient, __call)
 {
 	char *function, *soap_action = NULL, *uri = NULL;
@@ -2249,11 +2205,7 @@ PHP_METHOD(SoapClient, __call)
 		efree(soap_headers);
 	}
 }
-/* }}} */
 
-
-/* {{{ proto array SoapClient::__getFunctions ( void )
-   Returns list of SOAP functions */
 PHP_METHOD(SoapClient, __getFunctions)
 {
 	sdlPtr sdl;
@@ -2275,11 +2227,7 @@ PHP_METHOD(SoapClient, __getFunctions)
 		}
 	}
 }
-/* }}} */
 
-
-/* {{{ proto array SoapClient::__getTypes ( void )
-   Returns list of SOAP types */
 PHP_METHOD(SoapClient, __getTypes)
 {
 	sdlPtr sdl;
@@ -2303,11 +2251,7 @@ PHP_METHOD(SoapClient, __getTypes)
 		}
 	}
 }
-/* }}} */
 
-
-/* {{{ proto string SoapClient::__getLastRequest ( void )
-   Returns last SOAP request */
 PHP_METHOD(SoapClient, __getLastRequest)
 {
 	zval **tmp;
@@ -2317,11 +2261,7 @@ PHP_METHOD(SoapClient, __getLastRequest)
 	}
 	RETURN_NULL();
 }
-/* }}} */
 
-
-/* {{{ proto object SoapClient::__getLastResponse ( void )
-   Returns last SOAP response */
 PHP_METHOD(SoapClient, __getLastResponse)
 {
 	zval **tmp;
@@ -2331,11 +2271,7 @@ PHP_METHOD(SoapClient, __getLastResponse)
 	}
 	RETURN_NULL();
 }
-/* }}} */
 
-
-/* {{{ proto string SoapClient::__getLastRequestHeaders(void)
-   Returns last SOAP request headers */
 PHP_METHOD(SoapClient, __getLastRequestHeaders)
 {
 	zval **tmp;
@@ -2345,11 +2281,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders)
 	}
 	RETURN_NULL();
 }
-/* }}} */
 
-
-/* {{{ proto string SoapClient::__getLastResponseHeaders(void)
-   Returns last SOAP response headers */
 PHP_METHOD(SoapClient, __getLastResponseHeaders)
 {
 	zval **tmp;
@@ -2359,11 +2291,7 @@ PHP_METHOD(SoapClient, __getLastResponseHeaders)
 	}
 	RETURN_NULL();
 }
-/* }}} */
 
-
-/* {{{ proto string SoapClient::__doRequest()
-   SoapClient::__doRequest() */
 PHP_METHOD(SoapClient, __doRequest)
 {
   char *buf, *location, *action;
@@ -2384,7 +2312,6 @@ PHP_METHOD(SoapClient, __doRequest)
 	}
 	RETURN_NULL();
 }
-/* }}} */
 
 #ifndef ZEND_ENGINE_2
 static void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)

ext/standard/strnatcmp.c

@@ -153,13 +153,13 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
 			return +1;
 
 		++ap; ++bp;
-		if (ap >= aend && bp >= bend)
+		if (ap == aend && bp == bend)
 			/* The strings compare the same.  Perhaps the caller
 			   will want to call strcmp to break the tie. */
 			return 0;
-		else if (ap >= aend)
+		else if (ap == aend)
 			return -1;
-		else if (bp >= bend)
+		else if (bp == bend)
 			return 1;
 	}
 }

ext/standard/tests/strings/bug29075.phpt

@@ -1,14 +0,0 @@
---TEST--
-Bug #29075 (strnatcmp() incorrectly handles whitespace)
---FILE--
-<?php
-	var_dump(
-		strnatcmp('foo ', 'foo '),
-		strnatcmp('foo', 'foo'),
-		strnatcmp(' foo', ' foo')
-	);
-?>
---EXPECT--
-int(0)
-int(0)
-int(0)

ext/tidy/tidy.c

@@ -37,7 +37,7 @@
 #include "tidy.h"
 #include "buffio.h"
 
-#define PHP_TIDY_MODULE_VERSION	"2.0"
+#define PHP_TIDY_MODULE_VERSION	"2.0-dev"
 
 /* {{{ ext/tidy macros
 */

main/php_version.h

@@ -2,6 +2,6 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 0
-#define PHP_RELEASE_VERSION 1
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.0.1-dev"
+#define PHP_RELEASE_VERSION 0
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.0.0"

php.ini-dist

@@ -12,7 +12,7 @@
 
 
 ;;;;;;;;;;;;;;;;;;;
-; About php.ini   ;
+; About this file ;
 ;;;;;;;;;;;;;;;;;;;
 ; This file controls many aspects of PHP's behavior.  In order for PHP to
 ; read it, it must be named 'php.ini'.  PHP looks for it in the current
@@ -55,10 +55,6 @@
 ; dynamically loaded extension (either a PHP extension or a Zend extension),
 ; you may only use these constants *after* the line that loads the extension.
 ;
-;
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
 ; All the values in the php.ini-dist file correspond to the builtin
 ; defaults (that is, if no php.ini is used, or if you delete these lines,
 ; the builtin defaults will be identical).
@@ -110,8 +106,6 @@ output_buffering = Off
 ;       is doing.
 ; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
 ;       and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-;       Instead you must use zlib.output_handler.
 ;output_handler =
 
 ; Transparent output compression using the zlib library
@@ -162,7 +156,6 @@ serialize_precision = 100
 ; reference).
 allow_call_time_pass_reference = On
 
-;
 ; Safe Mode
 ;
 safe_mode = Off
@@ -241,7 +234,6 @@ max_execution_time = 30     ; Maximum execution time of each script, in seconds
 max_input_time = 60	; Maximum amount of time each script may spend parsing request data
 memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -271,10 +263,6 @@ memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 ;
 ; Examples:
 ;
-;   - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
-;
 ;   - Show all errors, except for notices
 ;
 ;error_reporting = E_ALL & ~E_NOTICE
@@ -566,7 +554,6 @@ default_socket_timeout = 60
 ;extension=php_iisfunc.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
-;extension=php_java.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
 ;extension=php_mcrypt.dll
@@ -733,8 +720,7 @@ msql.max_links = -1
 ; Allow or prevent persistent links.
 pgsql.allow_persistent = On
 
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
+; Detect broken persistent links always with pg_pconnect(). Need a little overhead.
 pgsql.auto_reset_persistent = Off
 
 ; Maximum number of persistent links.  -1 means no limit.
@@ -744,7 +730,6 @@ pgsql.max_persistent = -1
 pgsql.max_links = -1
 
 ; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
 pgsql.ignore_notice = 0
 
 ; Log PostgreSQL backends Noitce message or not.

php.ini-recommended

@@ -1,57 +1,12 @@
 [PHP]
 
-;;;;;;;;;;;;;;;;;;;
-; About php.ini   ;
-;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior.  In order for PHP to
-; read it, it must be named 'php.ini'.  PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory.  The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple.  Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-;
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; |        bitwise OR
-; &        bitwise AND
-; ~        bitwise NOT
-; !        boolean NOT
-;
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-;
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-;
-;  foo =         ; sets foo to an empty string
-;  foo = none    ; sets foo to an empty string
-;  foo = "none"  ; sets foo to the string 'none'
-;
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-; 
-;
 ;;;;;;;;;;;;;;;;;;;
 ; About this file ;
 ;;;;;;;;;;;;;;;;;;;
-; This is the recommended, PHP 5-style version of the php.ini-dist file.  It
+;
+; This is the recommended, PHP 4-style version of the php.ini-dist file.  It
 ; sets some non standard settings, that make PHP more efficient, more secure,
 ; and encourage cleaner coding.
-;
 ; The price is that with these settings, PHP may be incompatible with some
 ; applications, and sometimes, more difficult to develop with.  Using this
 ; file is warmly recommended for production sites.  As all of the changes from
@@ -64,7 +19,7 @@
 ; This file is different from the php.ini-dist file in the fact that it features
 ; different values for several directives, in order to improve performance, while
 ; possibly breaking compatibility with the standard out-of-the-box behavior of
-; PHP.  Please make sure you read what's different, and modify your scripts
+; PHP 3.  Please make sure you read what's different, and modify your scripts
 ; accordingly, if you decide to use this file instead.
 ;
 ; - register_globals = Off         [Security, Performance]
@@ -79,10 +34,6 @@
 ;     default) in the next version of PHP, because it often leads to security bugs.
 ;     Read http://php.net/manual/en/security.registerglobals.php for further
 ;     information.
-; - register_long_arrays = Off     [Performance]
-;     Disables registration of the older (and deprecated) long predefined array
-;     variables ($HTTP_*_VARS).  Instead, use the superglobals that were
-;     introduced in PHP 4.1.0
 ; - display_errors = Off           [Security]
 ;     With this directive set to off, errors that occur during the execution of
 ;     scripts will no longer be displayed as a part of the script output, and thus,
@@ -109,7 +60,7 @@
 ;     SQL databases without further manipulation.  Instead, you should use the
 ;     function addslashes() on each input element you wish to send to a database.
 ; - variables_order = "GPCS"       [Performance]
-;     The environment variables are not hashed into the $_ENV.  To access
+;     The environment variables are not hashed into the $HTTP_ENV_VARS[].  To access
 ;     environment variables, you can use getenv() instead.
 ; - error_reporting = E_ALL        [Code Cleanliness, Security(?)]
 ;     By default, PHP surpresses errors of type E_NOTICE.  These error messages
@@ -168,19 +119,17 @@ output_buffering = 4096
 ;       is doing.
 ; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
 ;       and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-;       Instead you must use zlib.output_handler.
 ;output_handler =
 
 ; Transparent output compression using the zlib library
 ; Valid values for this option are 'off', 'on', or a specific buffer size
 ; to be used for compression (default is 4KB)
 ; Note: Resulting chunk size may vary due to nature of compression. PHP
-;       outputs chunks that are few hundreds bytes each as a result of
-;       compression. If you prefer a larger chunk size for better
-;       performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-;       output_handler, or otherwise the output will be corrupted.
+;       outputs chunks that are few handreds bytes each as a result of compression.
+;       If you want larger chunk size for better performence, enable output_buffering
+;       also.
+; Note: output_handler must be empty if this is set 'On' !!!!
+;       Instead you must use zlib.output_handler.
 zlib.output_compression = Off
 
 ; You cannot specify additional output handlers if zlib.output_compression
@@ -500,7 +449,7 @@ default_mimetype = "text/html"
 ; cgi.force_redirect configuration below
 doc_root =
 
-; The directory under which PHP opens the script using /~username used only
+; The directory under which PHP opens the script using /~usernamem used only
 ; if nonempty.
 user_dir =
 
@@ -568,8 +517,8 @@ allow_url_fopen = On
 ; Define the anonymous ftp password (your email address)
 ;from="john@doe.com"
 
-; Define the User-Agent string
-; user_agent="PHP"
+; Define the user agent for php to send
+;user_agent="PHP"
 
 ; Default timeout for socket based streams (seconds)
 default_socket_timeout = 60
@@ -974,14 +923,6 @@ session.gc_divisor     = 1000
 ; cleaned up by the garbage collection process.
 session.gc_maxlifetime = 1440
 
-; NOTE: If you are using the subdirectory option for storing session files
-;       (see session.save_path above), then garbage collection does *not*
-;       happen automatically.  You will need to do your own garbage
-;       collection through a shell script, cron entry, or some other method.
-;       For example, the following script would is the equivalent of
-;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          cd /path/to/sessions; find -cmin +24 | xargs rm
-
 ; PHP 4.2 and less have an undocumented feature/bug that allows you to
 ; to initialize a session variable in the global scope, albeit register_globals
 ; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
@@ -1006,7 +947,7 @@ session.entropy_file =
 
 ;session.entropy_file = /dev/urandom
 
-; Set to {nocache,private,public,} to determine HTTP caching aspects
+; Set to {nocache,private,public,} to determine HTTP caching aspects.
 ; or leave this empty to avoid sending anti-caching headers.
 session.cache_limiter = nocache
 

sapi/apache/mod_php5.c

@@ -485,7 +485,7 @@ static void init_request_info(TSRMLS_D)
 		tmp = uudecode(r->pool, authorization);
 		SG(request_info).auth_user = NULL;
 		tmp_user = getword_nulls_nc(r->pool, &tmp, ':');
-		if (tmp_user) {
+		if (SG(request_info).auth_user) {
 			r->connection->user = pstrdup(r->connection->pool, tmp_user);
 			r->connection->ap_auth_type = "Basic";
 			SG(request_info).auth_user = estrdup(tmp_user);

sapi/apache_hooks/mod_php5.c

@@ -583,7 +583,7 @@ static void init_request_info(TSRMLS_D)
 		tmp = uudecode(r->pool, authorization);
 		SG(request_info).auth_user = NULL;
 		tmp_user = getword_nulls_nc(r->pool, &tmp, ':');
-		if (tmp_user) {
+		if (SG(request_info).auth_user) {
 			r->connection->user = pstrdup(r->connection->pool, tmp_user);
 			r->connection->ap_auth_type = "Basic";
 			SG(request_info).auth_user = estrdup(tmp_user);

sapi/cgi/cgi_main.c

@@ -177,7 +177,7 @@ static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
 	Bucket *f = *((Bucket **) a);
 	Bucket *s = *((Bucket **) b);
 
-	return strcasecmp(((zend_module_entry *)f->pData)->name,
+	return strcmp(((zend_module_entry *)f->pData)->name,
 				  ((zend_module_entry *)s->pData)->name);
 }
 

sapi/cli/php_cli.c

@@ -132,7 +132,7 @@ static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
 	Bucket *f = *((Bucket **) a);
 	Bucket *s = *((Bucket **) b);
 
-	return strcasecmp(((zend_module_entry *)f->pData)->name,
+	return strcmp(((zend_module_entry *)f->pData)->name,
 				  ((zend_module_entry *)s->pData)->name);
 }
 

tests/classes/bug26737.phpt

@@ -1,21 +0,0 @@
---TEST--
-Bug #26737 (Protected and private variables are not saved on serialization when a user defined __sleep is used)
---FILE--
-<?php
-class foo
-{
-	private $private = 'private';
-	protected $protected = 'protected';
-	public $public = 'public';
-
-	public function __sleep()
-	{
-		return array('private', 'protected', 'public');
-	}
-}
-$foo = new foo();
-$data = serialize($foo);
-var_dump(str_replace("\0", '\0', $data));
-?>
---EXPECT--
-string(114) "O:3:"foo":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"