From 8505e6ec1e68530d38d3e3bad04d2f1d2c5c24e3 Mon Sep 17 00:00:00 2001
From:  <changelog@php.net>
Date: Wed, 17 Jul 2002 00:19:37 +0000
Subject: [PATCH] ChangeLog update

---
 ChangeLog      | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 Zend/ChangeLog | 18 ++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f04ab41631..efabf2b9b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+2002-07-16  sniper  <sniper@pb1.pair.com>
+
+    * NEWS: This is the real world..
+
+    * ext/mysql/php_mysql.c: fix protos
+
+2002-07-16  Sascha Schumann  <sas@pb1.pair.com>
+
+    * sapi/thttpd/README
+      ext/ircg/README.txt: refine
+
+2002-07-16  georg  <georg@pb1.pair.com>
+
+    * NEWS: added mysql changes:
+    - php.ini option mysql.connect_timeout
+    - optional parameter client_flags (mysql_connect, mysql_pconnect)
+    - automatic rollback for non commited transactions
+
+2002-07-16  jason  <jason@pb1.pair.com>
+
+    * ext/standard/basic_functions.c:    Prevent reenterant calls to a user tick function by flagging the function
+    entry during call.
+
+    This prevents code like the following from infinitely recursing until a
+    crash occurs:
+    <?php
+
+    register_tick_function(a);
+
+    declare(ticks=1) {
+    	function a() {
+    		print "blah\n";
+    	}
+    	;
+    	;
+    	;
+    	;
+    }
+    ?>
+
+2002-07-16  georg  <georg@pb1.pair.com>
+
+    * ext/mysql/php_mysql.c
+      ext/mysql/php_mysql.h:
+    Added support for php.ini parameter "mysql.connect_timeout"
+
+    * php.ini-dist
+      php.ini-recommended: Added php.ini option "mysql_connection.timeout"
+
 2002-07-15  edink  <edink@pb1.pair.com>
 
     * ext/mbstring/mbstring.c: MFH
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index 41b5c3fd20..707bfc50af 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -1,3 +1,21 @@
+2002-07-16  Andi Gutmans  <andi@pb1.pair.com>
+
+    * ZEND_CHANGES: - Before I forget to list it, this was also added.
+
+    * zend_language_scanner.l:
+    - Syntactic sugar - Add "public" as a synonym for "var".
+    - Now we have the three P's.
+    You can do:
+
+    <?
+    	class MyClass {
+    		public $a;
+    		private $b;
+    		protected $c;
+    	}
+
+    ?>
+
 2002-07-15  derick  <derick@pb1.pair.com>
 
     * zend_operators.c: - MFH of the crap removal
-- 
2.40.0