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

BUGS

@@ -0,0 +1,11 @@
+If you think you've found a bug in PHP3, you can report it on the bug
+reporting page at:
+	http://www.php.net/
+
+Current Known Bugs:
+
+* split() function doesn't return regex errors nicely
+* Preprocessed scripts don't work with require() and define()
+* unset() doesn't actually erase the variables it just marks them as uninitialized
+* Some parts in the language core prevent more than 256 arguments in function
+  calls from being possible

CHANGES

@@ -0,0 +1,624 @@
+Noticeable Changes between PHP/FI 2.0 and PHP 3.0
+=================================================
+
+This file was designed to be viewed with a tab size of 4 characters.
+
+This file is divided into 4 sections:
+1.  Downwards incompatible language changes.  This section includes all of
+    the changes in the core language which may require people to modify
+    their scripts before using them with PHP 3.0.  It does NOT list
+    changes made in the behavior of specific functions.
+2.  New language features.  This section includes all of the new additions
+    to the core language, that may be used to enhance scripts designed for
+    PHP 3.0.  Likewise, it does not include a listing of new functions.
+3.  Structural changes not directly effecting the end user.  The core
+    of PHP 3.0 is a complete rewrite.  As such, many issues effecting
+    PHP/FI 2.0 were addressed and vastly improved in this version,
+    resulting in a much more stable and efficient implementation.  This
+    section lists these changes in design.
+4.  Other changes that don't fit in any of the above categories.
+
+Please remember that PHP 3.0's core is a complete rewrite, and thus,
+there may be other undocumented incompatibilities we haven't thought
+of ourselves.  If you think you've found a incompatibility (or a new
+feature) which is not listed here, please mail us at
+php-dev@php.iquest.net.
+
+
+
+												- Zeev
+
+------------------------------------------------------------------------------
+
+Downwards incompatible language changes
+=======================================
+
+[1]	The close-PHP tag has changed from > to ?>
+
+	This means that instead of writing:
+
+	<?echo $title;>
+
+	You should write:
+
+	<?echo $title;?>
+
+	PHP3 also includes support for a longer-form start tag that is
+	XML-compliant:
+
+	<?php echo $title;?>
+
+	The ability to use the short start tag ('<?') can be turned on and
+	off using the short_tags() function. Whether it is enabled or not by
+	default is a compile-time option (normally set to enabled by default).
+
+
+[2]	Semicolons in if/elseif/else must be replaced with colons.
+
+	For example, the equivalent of:
+
+		if (expr);
+		  statements
+		  ...
+		elseif (expr);
+		  statements
+		  ...
+		else;
+		  statements
+		endif;
+
+	in PHP 3.0 would be:
+
+		if (expr):
+		  statements
+		  ...
+		elseif (expr):
+		  statements
+		  ...
+		else:
+		  statements
+		endif;
+
+	Note that the endif is followed by a semicolon and not a colon even in
+	PHP 3.0, which marks the end of the entire IF sentence.
+
+	Also note that the implementation of the colon-mode and curly-braces
+	mode in PHP 3.0 is identical, one isn't buggier than the other (note
+	that I'm not saying they're not buggy, though :)
+
+
+[3]	Semicolons in while loops must also be replaced with colons.
+
+	For example, the equivalent of:
+
+		while (expr);
+		  statements
+		  ...
+		endwhile;
+
+	in PHP 3.0 would be:
+
+		while (expr):
+		  statements
+		  ...
+		endwhile;
+
+	Note that the endwhile is followed by a semicolon and not a colon even
+	in PHP 3.0, which marks the end of the WHILE sentence.  As with the IF
+	statement, the implementation of the colon-mode and curly-braces mode
+	in PHP 3.0 is identical, one isn't buggier than the other.
+
+	Also note that failing to change the semicolon to a colon can result in
+	scripts that get stuck in the while loop because the loop-condition never
+	changes.
+
+
+[4]	$foo[0] is no longer identical to $foo.
+
+	In PHP/FI 2.0, a side-effect of the implementation caused $foo[0] to be
+	identical to $foo.  This is not the case in PHP 3.0.
+
+
+[5]	Expressions determine their types differently.
+
+	The way expressions are evaluated has changed radically in PHP 3.0.
+	Expressions are no longer given the type of the left argument, but are
+	assigned types taking both types into account, and regardless of which
+	is on the left side and which is on the right side.  On simple scripts
+	that should probably not effect you, but if you've relied on this fact
+	(even without realizing you do) it may change the way your scripts work.
+	Consider the next example:
+
+		$a[0]=5;
+		$a[1]=7;
+
+		$key = key($a);
+		while ("" != $key) {
+			echo "$key\n";
+			next($a);
+		}
+
+
+	In PHP/FI 2.0, this would display both of $a's indices.  In PHP 3.0, it
+	wouldn't display anything.  The reason is that in PHP/FI 2.0, because the
+	left argument's type was string, a string comparison was made, and indeed
+	"" does not equal "0", and the loop went through.  In PHP 3.0, when a
+	string is compared with an integer, an integer comparison is made (the
+	string is converted to an integer).  This results in comparing atoi("")
+	which is 0, and $key which is also 0, and since 0==0, the loop doesn't
+	go through even once.  The fix for this is simple, by replacing the
+	while statement with:
+
+		while ("" != stringval($key)) {
+
+	This would first convert the integer 0 to a string "0", and then
+	compare "" and "0", which are not equal, and the loop would go through
+	as expected.  As mentioned later, casting operators are supported in
+	PHP 3.0 for a quicker and more readable way of changing variables'
+	types. For example, you could use:
+
+		while ("" != (string)$key) {
+
+
+[6]	The structure of error messages has changed.
+
+	Although the error messages are usually more accurate, you won't be shown
+	the actual line of text and actual place in which the error occured.
+	You'll be supplied with the line number in which the error has occured,
+	though.
+
+
+[7]	The format string argument to echo is no longer supported.
+
+	Use printf(format,arg1,arg2,arg3,...) instead (unlimited arguments).
+
+
+[8]	The use of read-mode $array[] is no longer supported.
+
+	That is, you cannot traverse an array by having a loop that does $data =
+	$array[].  Use current() and next() instead.  Also, $array1[] = $array2
+	does not append the values of $array2 to $array1, but appends $array2
+	as the last entry of $array1 (see the multidimensional array support).
+
+
+[9]	Apache versions older than 1.2 are not supported anymore.
+
+	The apache module requires apache 1.2 or later (1.3-beta is supported).
+
+
+[10] Indirect references inside quoted strings
+
+	PHP2-style indirect reference inside quoted strings is no longer
+    supported.  That is, if $foo="bar", and $bar="abc", in PHP2,
+    "$$foo" would print out "abc".  In PHP3, this would print
+    "$bar" (the contents of $foo is replaced with "bar").
+    To use indirect reference in PHP3 inside quoted strings, you should use 
+    the new notation: "${$foo}".  The standard $$foo notation will work
+    outside of the quoted string.
+
+[11]
+		Some functions have changed names, are missing, or have been deprecated
+		by other functions
+
+	As a whole new rewrite, written by many more people and supporting many
+	more APIs than it's predecessor, there's a good chance some of the functions
+	you're used to from PHP/FI 2 aren't available in release 3, or have changed
+	names.  Many functions that do exist behave a bit differently, mainly
+	because they return different values for errors (false) but also for other
+	reasons.  We can't list all of these functions here, simply because drawing
+	a full comparison between the function sets of the two versions is way too
+	much work.  If a converted PHP/FI 2 script doesn't work for you, nothing
+	can replace the good old human eye going over the code, doublechecking
+	with the online manual that each function still does what you expected it
+	to do.
+
+[12]	Other incompatibilities.
+
+	It's not too unlikely that other documented behavior of PHP2 has changed
+	in this release.  If you think you've found an example, please mail
+	us at php-dev@php.iquest.net.  Even if you've found an undocumented
+	feature of PHP2 that stopped working in PHP3, we'd like to know about it
+	(although it's more than likely that it will not be supported).
+
+
+
+------------------------------------------------------------------------------
+
+
+New Language Features
+=====================
+
+[1]	Expressions
+
+	PHP 3.0 includes a rich implementation of expressions, much more advanced
+	than this of 2.0.  Just about any complex C-like or perl-like expression
+	would work.  Support was added for assignment operators (+=, -=, *= etc),
+	pre and post increment/decerement (e.g. $i++, ++$i) and the questionmark
+	operator ( (expr?expr:expr) ).  Every assignment is now an expression
+	with a value, which means stuff like $a = $b = $c = $d = 0;  would work.
+	It is difficult to describe the power of expressions within a few lines
+	of text, but if you're familiar with them, you probably get the picture.
+
+
+[2]	for loops are now supported.
+
+	for loops were fairly difficult to implement (in fact, we didn't find
+	any parallel interpreter that supports for loops anywhere (no, perl is
+	not an interpreter)).  The bottom line is that for loops work, and are
+	around 5% slower than comparable while loops (that may vary), but often
+	they're much nicer.
+
+	The syntax is identical to the one of C:
+
+		for (expr; expr; expr) statement;
+
+	or
+
+		for (expr; expr; expr) { statements ... }
+
+	The first expression is executed the first time the loop is encountered,
+	the loop is run as long as the second expression is evaluated as TRUE,
+	and after each iteration, the 3rd expression is evaluated.
+
+	Colon-mode FOR loops are also supported:
+	for (expr; expr; expr):
+		statements
+		...
+	endfor;
+
+
+[3]	do..while(expr) loops are now supported.
+
+	Like with its C parallel, the statements inside a do..while loop are
+	run once the first time the loop is encountered, and then as long as
+	the expression evaluates as true.
+
+	For example:
+
+		do {
+			statements;
+		} while ($i++ < $max);
+
+
+[4]	break and continue statements are now supported inside loops.
+
+	You can break out of loops, or continue to the next iteration of the
+	loop using these statements.  A special feature of PHP is the ability
+	to specify an expression argument to break or continue, which specifies
+	how many loops you want to break out from or continue to.  For example:
+
+		for ($i=0; $i<10; $i++) {
+			for ($j=0; $j<10; $j++) {
+				if ($j>5)
+					break;
+				if ($i>5)
+					break 2;
+			}
+		}
+	
+	The first break statement would end the inner loop every time $j is
+	greater than 5.  The second break statement would end both the inner
+	and outer loop when $i is greater than 5.
+
+	Note:  For this matter, switch statements are considered as loops.  So
+	if you write "break 2;" inside a switch statement, you would be asking
+	to break out of the switch, and the innermost loop in which is nested.
+
+
+[5]	Switched to C-style declaration of functions.
+
+	Here's a pretty useless function which makes a good example:
+
+		function concat($str1,$str2)
+		{
+			return $str1.$str2;
+		}
+
+	NOTE:	The old style function definition is still supported, to
+			allow easier upgrading from PHP/FI 2.0 scripts.  Simply
+			change 'function' to 'old_function' for these functions.
+
+
+[6]	OOP support
+
+	Classes and inheritance are supported to a limited extent in PHP 3.0.
+	Here's how to declare a simple class:
+
+		class simple_class {
+			var $property1,$property2;
+			var $property3=5;
+
+			function display() {
+				printf("p1=%d, p2=%d, p3=%d\n",
+					$this->property1,
+					$this->property2,
+					$this->property3);
+			}
+			function init($p1,$p2) {
+				$this->property1 = $p1;
+				$this->property2 = $p2;
+			}
+		};
+
+	Here's how to create an object of that class:
+
+		$obj = new simple_class;
+
+	At this point, $obj is an object with 2 uninitialized variables, 1
+	initialized variable, and 2 member functions.  No protection is made on
+	the internals of the object, and using its properties is simple:
+
+		$obj->property1 = 7;
+
+	would assign 7 to $property1 inside $obj.  Calling member functions is
+	also simple:
+
+		$obj->display()
+
+	would run the display() member function of $obj.  Note that the
+	implementation of display() uses the special variable $this, which is
+	replaced with the object the function is called on.
+
+	Inheritance is pretty simple too:
+
+		class complex_class extends simple_class {
+			var $property4="test";
+
+			function display() {
+				printf("p1=%d, p2=%d, p3=%d, p4=%d\n",
+					$this->property1,
+					$this->property2,
+					$this->property3,
+					$this->property4);
+			}
+		}	
+
+	Basically, the class complex_class inherits everything from its parent,
+	simple_class, except properties or member functions which override the
+	ones in the parent.  In this example, since we supply an alternative
+	display() function, it would be used with complex_class objects instead
+	of the display() function that was declared in simple_class.  On the other
+	hand, since we don't supply an alternative init() function, complex_class
+	objects would have the same init() function as simple_class objects do.
+
+	As with expressions, it's impossible to teach OOP in a few lines, and
+	personally I'm unclear as to how useful this would be in day to day
+	scripting.  If you like this, play with this until you figure it out :)
+
+	Objects can reside in arrays, and can contain arrays.  However,
+	a limitation of the current implementation doesn't allow an object
+	to contain an array of objects (actually, this is allowed, but
+	there's no way to address the properties of such an object directly,
+	but only indirectly).  For example, assuming $a[3] is an object,
+	$a[3]->b[2] is an object as well, you can't address the properties
+	of $a[3]->b[2] (i.e. you can't write $a[3]->b[2]->foo = "bar", for
+	instance).  
+
+
+[7]	Function pointers are now supported.
+
+	A simple illustrative example:
+
+		$func_ptr = "time";
+		$current_time = $func_ptr();
+
+	is identical to
+
+		$current_time = time();
+
+
+[8]	Indirect references are much more powerful.
+
+	For example, one can use the dollar operator an infinite amount of times:
+
+		$a = "b";
+		$b = "c";
+		$c = "d";
+		$d = "e";
+		$e = "Testing\n";
+
+		echo $$$$$a;
+
+	Would display $e's content, which is "Testing\n".
+
+	In addition, one can use complex expressions to generate variable names
+	using a perl-like notation:
+
+		$i="123";
+		${"test".$i} = 5;
+
+	would assign 5 to $test123.
+
+[9]	A string concatenation operator was added, '+' no longer concatenates strings.
+
+	A perl-like string concatenation operator was added, the '.' operator.
+	It converts both of its arguments to strings, and concatenates them.
+	For example:
+
+		$result = "abcd".5;
+
+	assigns "abcd5" to result.  Note that under PHP 3.0, the '+' operator
+	no longer performs concatenation if its arguments are strings.  Use
+	the '.' operator instead.
+
+[10]	Supports passing function arguments by references instead of by value.
+
+	Support for passing function arguments by reference instead of by value
+	has been added.  This doesn't result in having to change the function
+	implementations in any way, but, when calling the function, you can
+	decide on whether the variable you supply would actually be changed by
+	the function, or a copy of it.
+
+	Example:
+
+		function inc($arg)
+		{
+			$arg++;
+		}
+
+		$i=0;
+		inc($i);  # here $i in the outer scope wouldn't change, and remain 0
+		inc(&$i); # here $i is passed by reference, and would change to 1
+
+
+[11]	Support for multidimensional arrays.
+
+	(Or as Andi calls them, 'hyperdimensional variables'.)
+
+	The easiest way to define this support of PHP 3.0 is inductive -
+	arrays can contain any type of variables, including other arrays.
+	A simple example:
+
+		$a[0]=5;
+		$a[1]["testing"]=17;
+		$b["foo"]=$a;
+
+	Ok, so it may be not so simple.  Play with it, it's pretty powerful.
+
+
+[12]	Array initialization is now supported.
+
+	For example, let's say you want to initialize a lookup table to convert
+	number to month names:
+
+		$months = array("January", "February", "March",
+						"April", "May", "June", "July", "August",
+				 		"September", "October", "November", "December");
+
+	would assign $months[0] to be January, $months[1] to be February, etc.
+	Alternately, you may want the count to start at '1' instead of 0.
+	You can do so easily:
+
+		$months = array(1=>"January", "February", "March",
+						"April", "May", "June", "July", "August",
+						"September", "October", "November", "December");
+
+	Also, you can specify an index for every entry, not just the first one:
+
+		$first_names = array("Doe"=>"John", "Gates"=>"William",
+							"Clinton"=>"Bill" });
+
+	would assign $first_names["Doe"]="John", etc.
+
+
+[13]	Perl style lists now supported.
+
+	Multiple values from arrays may now be assigned into several
+	variables using one assignment.  For example:
+	
+		$str = "johndoe:x:555:555:Doe, John:/home/johndoe:/bin/tcsh";
+		
+		list($username,$passwd,$uid,$gid,$realname,$homedir,$shell) = 
+			explode(":",$str);
+	
+	Would assign 'johndoe' into $username, 'x' into $passwd, etc.
+
+
+[14]	Colons are supported in 'case' and 'default' statements.
+
+	For example:
+
+		switch($value) {
+			case 'A':
+				statement;
+				break;
+			case 'B':
+				statement;
+				break;
+			case 'C':
+				statement;
+				/* fall-through */
+			default:
+				statement;
+		}
+	
+	Semicolons are still supported, but when writing new scripts, they
+	should be phased out in favour of colons.
+
+
+------------------------------------------------------------------------------
+
+
+Non Language Related New Features
+=================================
+
+[1]	Persistent resource lists.
+
+	In plain english this means that there's now an easy way of writing the
+	SQL drivers so that they don't open and close the SQL link every time,
+	but instead open it the first time it's required, and then use it on
+	every later hit.  As of PHP 3.0a1, only the MySQL, mSQL and PostgresSQL
+	drivers have been changed (rewritten) to take advantage of this option.
+	To use it, use mysql_pconnect() instead of mysql_connect() (or the
+	equivalents for the two other databases).
+
+
+[2]	Configuration file.
+
+	PHP now has its own configuration file, and many compile-time options
+	of PHP2 are now configurable at runtime.
+
+
+[3]	Syntax Highlighting.
+
+	A syntax highlighter has been built into PHP 3.0, which means PHP 3.0 can
+	display your code, syntax highlighted, instead of executing it.
+	There are currently two ways to use the syntax highlighter.  One is to
+	use the show_source() statement.  This statement is identical to the
+	include() statement, except instead of executing the file, it displays
+	its source syntax highlighted.
+	The second way is possible only when running as an apache module, and is
+	to define a special extension for PHP 3.0 source files (e.g. .php3s)
+	and instruct apache to automatically syntax highlight them.
+
+
+[4]	Loadable modules.
+
+	This would have a huge impact on the Windows version, and would probably
+	be used in the UNIX environment as well.  One can now add PHP internal
+	functions in runtime by loading a dynamic module.  This is known to work
+	under Solaris, Linux and Win32 at this time, but would be ported to any
+	other capable platform if an incompatability is found.
+
+
+------------------------------------------------------------------------------
+
+
+Other Interesting Issues
+========================
+
+
+[1]	Improved performance.
+
+	The performance of PHP 3.0 is much better than the one of PHP/FI 2.0.
+	Memory consumption has been dramatically reduced in many cases, due
+	to the use of an internal memory manager, instead of apache's pools.
+	Speedwise, PHP 3.0 is somewhere between 2 and 3 times faster than
+	PHP/FI 2.0.
+
+
+[2]	More reliable parser.
+
+	After PHP 3.0 is well tested, it'll be pretty safe to say that it's
+	more reliable than PHP/FI 2.0 is.  While PHP/FI 2.0 performed well on
+	simple, and fairly complex scripts, a fundamental design difference
+	from PHP 3.0 makes it more prone to errors.  In PHP 3.0, obscure parser
+	problems are much less likely.
+
+
+[3]	Improved C API.
+
+	If you're a C coder, adding functionality to PHP was never easier.
+	A pretty well documented API is available (apidoc.txt), and you no longer
+	have to touch the parser or scanner code when adding your function.
+	Also, it's more complicated to 'go wrong' when implementing a PHP3
+	function than it was in PHP2 (no stack to maintain) - but of course,
+	you can mess up here too :)
+
+
+[4]	Name change.
+
+	PHP/FI 2.0 was renamed to PHP 3.0, and the meaning has changed from
+	'Personal Home Pages / Forms Interpreter' to 'PHP: Hypertext Preprocessor'.
+	'Personal' home pages was an understatement for PHP/FI 2.0, and is
+	definitely an understatement for PHP 3.0.

CODING_STANDARDS

@@ -5,9 +5,8 @@ PHP Coding Standards
 This file lists several standards that any programmer, adding or changing
 code in PHP, should follow.  Since this file was added at a very late
 stage of the development of PHP v3.0, the code base does not (yet) fully
-follow it, but it's going in that general direction.  Since we are now
-well into the version 4 releases, many sections have been recoded to use
-these rules.
+follow it, but it's going in that general direction.
+This is an initial version - it'll most probably grow as time passes.
 
 
 Code Implementation
@@ -44,9 +43,9 @@ Exceptions:
     for efficiency and in order for them to be binary-safe.
     Functions that change strings and obtain their new lengths while
     doing so, should return that new length, so it doesn't have to be
-    recalculated with strlen() (e.g. php_addslashes())
+    recalculated with strlen() (e.g. _php3_addslashes())
 
-[5] Use php_error() to report any errors/warnings during code execution.
+[5] Use php3_error() to report any errors/warnings during code execution.
     Use descriptive error messages, and try to avoid using identical
     error strings for different stages of an error.  For example,
     if in order to obtain a URL you have to parse the URL, connect,
@@ -64,57 +63,24 @@ Exceptions:
 Naming Conventions
 ------------------
 
-[1] Function names for user-level functions should be enclosed with in
-    the PHP_FUNCTION() macro. They should be in lowercase, with words
-    underscore delimited, with care taken to minimize the letter count.
-    Abbreviations should not be used when they greatly decrease the
-    readability of the function name itself.
+[1] Function names for user functions implementation should be prefixed with
+    "php3_", and followed by a word or an underscore-delimited list of words,
+    in lowercase letters, that describes the function.
 
-    Good:
-    'mcrypt_enc_self_test'
-    'mysql_list_fields'
-
-    Ok:
-    'mcrypt_module_get_algo_supported_key_sizes'
-    (could be 'mcrypt_mod_get_algo_sup_key_sizes'?)
-    'get_html_translation_table'
-    (could be 'html_get_trans_table'?) 
-
-    Bad:
-    'hw_GetObjectByQueryCollObj'
-    'pg_setclientencoding'
-    'jf_n_s_i'
-    
-    
-[2] If they are part of a "parent set" of functions, that parent should
-    be included in the user function name, and should be clearly related
-    to the parent program or function family. This should be in the form
-    of parent_*.
-    
-    A family of 'foo' functions, for example:
-    Good:
-    'foo_select_bar'
-    'foo_insert_baz'
-    'foo_delete_baz'
-
-    Bad:
-    'fooselect_bar'
-    'fooinsertbaz'
-    'delete_foo_baz'
-
-[3] Function names used by user functions should be prefixed
-    with "_php_", and followed by a word or an underscore-delimited list of
+[2] Function names used by user functions implementations should be prefixed
+    with "_php3_", and followed by a word or an underscore-delimited list of
     words, in lowercase letters, that describes the function.  If applicable,
     they should be declared 'static'.
     
-[4] Variable names must be meaningful.  One letter variable names must be
+[3] Variable names must be meaningful.  One letter variable names must be
     avoided, except for places where the variable has no real meaning or
     a trivial meaning (e.g. for (i=0; i<100; i++) ...).
 
-[5] Variable names should be in lowercase;  Use underscores to seperate
+[4] Variable names should be in lowercase;  Use underscores to seperate
     between words.
 
 
+
 Syntax and indentation
 ----------------------
 
@@ -128,32 +94,25 @@ Syntax and indentation
     is known to accept C++-style comments in C code.
 
 [2] Use K&R-style.  Of course, we can't and don't want to
-    force anybody to use a style he or she is not used to, but,
+    force anybody to use a style she's not used to, but
     at the very least, when you write code that goes into the core
     of PHP or one of its standard modules, please maintain the K&R
     style.  This applies to just about everything, starting with
     indentation and comment styles and up to function decleration
     syntax.
     
-[3] Be generous with whitespace and braces.  Always prefer:
-
-	if (foo) {
+[3] Be generous with whitespace and braces.  Always prefer
+    if (foo) {
 		bar;
 	}
-
-	to:
-
+	to
 	if(foo)bar;
-
+	
     Keep one empty line between the variable decleration section and
     the statements in a block, as well as between logical statement
     groups in a block.  Maintain at least one empty line between
     two functions, preferably two.
 
-[4] When indenting, use the tab character.  A tab is expected to represent
-    four spaces.  It is important to maintain consistency in indenture so
-    that definitions, comments, and control structures line up correctly.
-
 Documentation and Folding Hooks
 -------------------------------
 
@@ -164,8 +123,7 @@ function does.  It would look like this:
 
 /* {{{ proto int abs(int number)
    Return the absolute value of the number */
-PHP_FUNCTION(abs)
-{
+void php3_abs(INTERNAL_FUNCTION_PARAMETERS) {
    ...
 }
 /* }}} */
@@ -185,35 +143,7 @@ messing up the function summary.
 Optional arguments are written like this:
 
 /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters. */
 
-And yes, please keep the prototype on a single line, even if that line
-is massive.
+And yes, please keep everything on a single line, even if that line is massive.
 
-New and Experimental Functions
------------------------------------
-To reduce the problems normally associated with the first public
-implementation of a new set of functions, it has been suggested
-that the first implementation include a file labeled 'EXPERIMENTAL'
-in the function directory, and that the functions follow the
-standard prefixing conventions during their initial implementation.
 
-The file labelled 'EXPERIMENTAL' should include the following
-information:
-   Any authoring infomration (known bugs, future directions of the module).
-   Ongoing status notes which may not be appropriate for CVS comments.
-
-Aliases & Legacy Documentation
------------------------------------
-You may also have some deprecated aliases with close to duplicate
-names, for example, somedb_select_result and somedb_selectresult. For
-documentation puposes, these will only be documented by the most
-current name, with the aliases listed in the documentation for
-the parent function. For ease of reference, user-functions with
-completely different names, that alias to the same function (such as
-highlight_file and show_source), will be separately documented. The
-proto should still be included, describing which function is aliased.
-
-Backwards compatible functions and names should be maintained as long
-as the code can be reasonably be kept as part of the codebase. See
-/phpdoc/README for me information on documentation.

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                          675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -278,5 +278,62 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
 
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
 
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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 2 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, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

CREDITS

@@ -1,2 +1,176 @@
-For the list of people who've put work into PHP 4.0, please see
-http://www.php.net/credits.php
+PHP Version 3.0 Development Team
+
+------------------------------------------------------------------------------
+
+Core Developers
+===============
+
+Rasmus Lerdorf (rasmus@lerdorf.on.ca)
+
+* Original language definition and implementation
+* CGI loader and many internal functions
+* Apache module support
+* SNMP module
+* Original mSQL, MySQL and Sybase modules
+* Oracle module work
+
+
+Andi Gutmans (andi@php.net) and Zeev Suraski (zeev@php.net)
+
+* New language definition and implementation
+* Internal functions API design
+* General hash table implementation for symbol tables, arrays and objects
+* Memory manager
+* Token cache manager
+* A lot of internal functions (including hebrev :) and migration from PHP 2.0
+* Syntax highlighting mode
+* Configuration file parser
+* New persistent/multilink MySQL, PosgresSQL, Sybase and mSQL modules
+* Win32 COM support
+
+
+Stig Bakken (ssb@guardian.no)
+
+* Oracle support
+* configure/install script work
+* sprintf reimplementation
+* XML support
+* SGML documentation framework
+
+
+Shane Caraveo (shane@caraveo.com)
+
+* Porting to Visual C++
+* Generalization to support different server APIs
+* Work on ISAPI and NSAPI APIs
+
+
+Jim Winstead (jimw@php.net)
+
+* Lots of PHP2 -> PHP3 porting
+* dBase support
+* URL parsing functions
+* Makefile work
+* Regex rewrite
+* Win32 work
+
+
+------------------------------------------------------------------------------	
+
+Major Contributors
+==================
+
+* Jouni Ahto (jah@cultnet.fi)
+  Postgres, Informix
+
+* Alex Belits (abelits@phobos.illtel.denver.co.us)
+  fhttpd support
+
+* Bjørn Borud (borud@guardian.no) 
+  soundex code and lots of enthusiasm
+
+* Christian Cartus (chc@idgruppe.de)
+  Informix Universal Server support
+
+* John Ellson (ellson@lucent.com)
+  Freetype support
+
+* Dean Gaudet (dgaudet@arctic.org)
+  Apache module debugging + helpful hints along the way
+
+* Mitch Golden (mgolden@interport.net)
+  Oracle testing and bug fixes
+
+* Danny Heijl (Danny.Heijl@cevi.be)
+  Informix SE support
+
+* Mark Henderson (mark@togglemedia.com)
+  Various odds and ends
+
+* Jaakko Hyvätti (jaakko@hyvatti.iki.fi)
+  Prototype cop, regular expression code fixes, CGI security issues
+
+* Amitay Isaacs (amitay@w-o-i.com)
+  LDAP
+
+* Andreas Karajannis (Andreas.Karajannis@gmd.de) 
+  Adabas D, ODBC, Oracle
+
+* Igor Kovalenko (owl@infomarket.ru)
+  QNX support issues
+
+* Richard Lynch (lynch@lscorp.com)
+  Documentation
+
+* Tom May (tom@go2net.com)
+  Sybase-CT work
+
+* Muhammad A Muquit (MA_Muquit@fccc.ed)
+  Original Sybase module
+
+* Mark Musone (musone@edgeglobal.com)
+  IMAP
+  
+* Jeroen van der Most (jvdmost@digiface.nl)
+  Solid
+  
+* Chad Robinson (chadr@brttech.com)
+  Documentation, FilePro
+
+* Lachlan Roche (lr@www.wwi.com.au)
+  MD5
+
+* Stefan Roehrich (sr@linux.de)
+  zlib
+
+* Nikolay P. Romanyuk (mag@redcom.ru)
+  Velocis support
+  
+* Brian Schaffner (brian@tool.net)
+  ODBC support, PHP3 API testing
+
+* Egon Schmid (eschmid@delos.lf.net)
+  Documentation
+
+* (sopwith@redhat.com)
+  Solid
+  
+* Colin Viebrock (cmv@privateworld.com)
+  Website graphic design and layout, PHP logo
+
+* Eric Warnke (ericw@albany.edu)   
+  LDAP
+
+* Lars Torben Wilson (torben@netmill.com)
+  Documentation
+
+* Uwe Steinmann (Uwe.Steinmann@fernuni-hagen.de)
+  Hyperwave, PDF, Acrobat FDF Toolkit
+
+------------------------------------------------------------------------------
+
+Beta Testers
+------------
+
+* Niklas Saers (berenmls@saers.com)
+  FreeBSD/x86
+
+* Chuck Hagenbuch <chuck@osmos.ml.org>
+  Linux/x86 glibc2, MySQL, mod_ssl
+
+* Sascha Schumann (sas@schell.de)
+  FreeBSD/x86, PostgreSQL, IMAP, gdttf
+
+* Jim Jagielski (jim@jagunet.com)
+  A/UX, FreeBSD/x86
+
+* Jouni Ahto (jah@cultnet.fi)
+  Debian Linux 2.0
+
+
+
+
+------------------------------------------------------------------------------
+
+Andi Gutmans and Zeev Suraski would like to thank Professor Michael Rodeh for
+his positive input during the initial development of the interpreter.

ChangeLog.TODO

@@ -0,0 +1,103 @@
+
+This is the ChangeLog from PHP3 as of Apr 12 1999. 
+
+Entries should be removed from this file, if you transfer changes
+over to PHP4.
+
+============================================================================
+
+?? 1999, Version 3.0.8
+- added Oracle-OCI8 persistent connections
+- fixed OCIDefineByName crash.
+- fixed some NULL-column related problems in OCI8-module.
+- avoid stripping double slashes when fopen'ing files (Sascha)
+- sql_regcase() change: only apply to alphabetic characters (Sascha)
+- add snmprealwalk() (Sascha Schumann)
+- fix serious bug in strftime() (Sascha Schumann)
+- fix bug in ucwords() (Sascha Schumann)
+- optimized fgets() and fread()
+- memory leak in operators.c fixed
+- socket leak fixed (Sascha Schumann)
+- Fixed the XML bug that caused garbage behind attributes
+- Some Informix driver improvements.
+- PUT method support (mlemos@acm.org)
+- Add ldap_mod_add(), ldap_mod_del() and ldap_mod_replace() (Gerritt Thomson)
+- Fix parameter count problem in odbc_setoption()
+- Replace broken str_replace(). The fix in 3.0.7 was bogus (Sascha Schumann)
+- Really fix implode() this time.  The fix in 3.0.7 was bogus
+- Added more option to the date() function: (Colin Viebrock)
+  'g' - hour, 12-hour format, no leading zeros
+  'G' - hour, 24-hour format, no leading zeros
+  'n' - month, numeric, no leading zeros
+- Make fgetss() slightly smarter
+- Add strip_tags() which uses the fgetss state-machine but acts on a string
+- Add CRYPT_SALT_LENGTH constant
+
+March 1 1999, Version 3.0.7
+- Added pdf_put_image and pdf_execute_image
+- Initial work on an ImageMagick module - doesn't do anything yet
+- Make configure script detect Netscape's LDAP SDK automagically
+- Fixed Oracle-OCI8 module for windows.
+- Add OCIRowCount function. (Number of affected rows for update-statements)
+- Add OCIDefineByName function.
+- Change the behaviour of open_basedir. It's now possible to supply more
+  than one directory. open_basedir paths from parent directories are now
+  automatically inherited.
+- fix rand() and mt_rand() to make the ranges work correctly
+- htmlspecialchars() and htmlentities() are now binary safe.
+- Add extract() function.
+- Oracle-OCI8 driver now supports BLOBS/CLOBS and IN/OUT binding of local php
+  variables.
+- Clean up apxs build
+- Add INSTALL.REDHAT file to walk RedHat users through the install
+- Added YP/NIS module from Stephanie Wehner
+- Added optional second argument to mysql_fetch_array();  MYSQL_ASSOC will
+  cause the resulting array to contain the associative indices only,
+  MYSQL_NUM will cause the array to contain the numeric indices only (like
+  mysql_fetch_row()) and MYSQL_BOTH would cause them both to be defined
+  (default).
+- Backport the Zend debugging memory manager into the PHP 3.0.x tree.
+- Add function_exists() function.
+- Add another version of WDDX module
+  (we need to pick a single implementation here)
+- Fixed includes for iODBC to support both the old and the new LGPL version
+- Add flock() function
+- Fix implode() bug - When imploding an array that contained unset() elements
+  it wasn't correctly skipping past these
+- Add connection_status() function.  This returns the raw bitfield which
+  indicates whether the script terminated due to a user abort, a timeout
+  or normally.  Note that if ignore_user_abort is enabled, then both the
+  timeout state and the user abort state can be active
+- Add connection_timeout() function.  This one can be called in a shutdown
+  function to tell you if you got there because of a timeout
+- Add ignore_user_abort() function and .ini/.conf directive of same name
+- Fix connection abort detection code - It should now work reliably with
+  Apache.  Also added a user-level connection_aborted() function designed to
+  let people check whether the user aborted the connection in a user-level
+  shutdown function.
+- Add pfsockopen() function
+- Improvements in FreeType support: Macintosh fonts work, and non-antialiased
+  output is considerably cleaner  <mka@satama.com>
+- Fixed checkdate() function, range of valid years is now 0 to 32767
+- Make sure XML element attributes have the right character encoding
+- hw_insertdocument() returns object id now
+- Add pdf_open() warning in configure and documentation
+- Add diskfreespace() function
+- Added aspell support
+- Iptcparse would sometimes find a wrong tag.
+- Force var_dump() to output headers
+- Add optional 3th parameter to ora_fetchinto.
+- Serialize and var_dump no longer show array elements that
+  have been unset.
+- Add IptcEmbed() function (can replace an APP13-Marker in a JPEG file)
+- Add OCI8 module for Windows
+- Fix bug in pdf_close() function
+- Add WDDX support (see http://www.wddx.org for more info)
+- Add similar_text() function
+- Constructors of parent classes weren't accessible to derived classes (as
+  of 3.0.6).  Fixed.
+- Introduce simple regex compilation cache
+- Add gettimeofday() function
+- Add getrusage() function
+
+

EXTENSIONS

@@ -1,425 +0,0 @@
-                     List of PHP maintainers
-                     =======================
-
-Maintenance legend
-------------------
-    Supported:       Someone is actually paid to look after this.
-    Maintained:      Someone actually looks after it.
-    Odd Fixes:       It has a maintainer but they don't have time to do
-                     much other than throw the odd patch in. See below.
-    Orphan:          No current maintainer [but maybe you could take the
-                     role as you write your new code].
-    Obsolete:        Old code. Something tagged obsolete generally means
-                     it has been replaced by a better system and you
-                     should be using that.
-    Unknown:         Not known at this time.
-
-Status legend
--------------
-    Working:         Working under both Windows and Unix.
-    Windows:         Working only under Windows.
-    Unix:            Working only under Unix.
-    Experimental:    Under development or initial release.
-    Not Working:     Not working.
-    Unknown:         Status unknown.
-
-
-== Server APIs ==
-
--------------------------------------------------------------------------------
-EXTENSION:           aolserver
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           apache
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           cgi
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           fhttpd
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           isapi
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           nsapi
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           phttpd
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           pi3web
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           roxen
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           servlet
-PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           thttpd
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-
-
-== Database extensions ==
-
--------------------------------------------------------------------------------
-EXTENSION:           dba
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           dbase
-PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           filepro
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           hyperwave
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           informix
-PRIMARY MAINTAINER:  Danny Heijl <Danny.Heijl@cevi.be>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           ingres_ii
-PRIMARY MAINTAINER:  David Hénot <henot@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.2
--------------------------------------------------------------------------------
-EXTENSION:           interbase
-PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           msql
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           mssql
-PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Tested on phpts and isapi versions
--------------------------------------------------------------------------------
-EXTENSION:           mysql
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
-MAINTENANCE:         Odd fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           sybase
-MAINTENANCE:         Unknown
-STATUS:              Not Working
--------------------------------------------------------------------------------
-EXTENSION:           sybase_ct
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           oci8
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           odbc
-PRIMARY MAINTAINER:  Andreas Karajannis <Karajannis@gmd.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Working except for persistent connections
--------------------------------------------------------------------------------
-EXTENSION:           oracle
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-COMMENT:             Using the new OCI8 driver is encouraged where possible.
--------------------------------------------------------------------------------
-
-
-== Other extensions ==
-
--------------------------------------------------------------------------------
-EXTENSION:           aspell
-MAINTENANCE:         Unknown
-STATUS:              Working
-COMMENT:             For aspell .27 and greater, check out the pspell extension
--------------------------------------------------------------------------------
-EXTENSION:           bcmath
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           bz2
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.3
--------------------------------------------------------------------------------
-EXTENSION:           calendar
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           com
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           cpdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           crack
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-SINCE:               4.0.5
--------------------------------------------------------------------------------
-EXTENSION:           curl
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.0.2
--------------------------------------------------------------------------------
-EXTENSION:           cybercash
-PRIMARY MAINTAINER:  Evan Klinger <evan715@sirius.com>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           domxml
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
--------------------------------------------------------------------------------
-EXTENSION:           dotnet
-PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
--------------------------------------------------------------------------------
-EXTENSION:           exif
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-SINCE:               4.0.1
--------------------------------------------------------------------------------
-EXTENSION:           fdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           ftp
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           gd
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           gettext
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           gmp
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-SINCE:               4.0.4
--------------------------------------------------------------------------------
-EXTENSION:           icap
-MAINTENANCE:         Unknown
-STATUS:              Obsolete
--------------------------------------------------------------------------------
-EXTENSION:           imap
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           java
-PRIMARY MAINTAINER:  Sam Ruby <rubys@us.ibm.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           ldap
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           mcal
-PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           mhash
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           muscat
-PRIMARY MAINTAINER:  Sam Liddicott <sam@ananova.com>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.0.5
-COMMENT:             Not tested against windows, only core API completed, rest under development
--------------------------------------------------------------------------------
-EXTENSION:           openssl
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.4
--------------------------------------------------------------------------------
-EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           pdf
-PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           pfpro
-PRIMARY MAINTAINER:  David Croft <david@infotrek.co.uk>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.0.2
--------------------------------------------------------------------------------
-EXTENSION:           posix
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           printer
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-SINCE:               4.0.4
-COMMENT:             Only for Win32
--------------------------------------------------------------------------------
-EXTENSION:           pspell
-PRIMARY MAINTAINER:  Vlad Krupin <phpdevel@echospace.com>
-MAINTENANCE:         Unknown
-STATUS:              Unknown
-SINCE:               4.0.2
--------------------------------------------------------------------------------
-EXTENSION:           qtdom
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-SINCE:               4.0.4
--------------------------------------------------------------------------------
-EXTENSION:           readline
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           recode
-PRIMARY MAINTAINER:  Kristian Köhntopp <kris@koehntopp.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           sablot
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.3
--------------------------------------------------------------------------------
-EXTENSION:           satellite
-PRIMARY MAINTAINER:  David Eriksson <eriksson@php.net>
-MAINTENANCE:         Odd Fixes
-STATUS:              Experimental
-SINCE:               4.0.3
--------------------------------------------------------------------------------
-EXTENSION:           session
-PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           shmop
-PRIMARY MAINTAINER:  Unknown
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-SINCE:               4.0.3
--------------------------------------------------------------------------------
-EXTENSION:           snmp
-PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           sockets
-PRIMARY MAINTAINER:  Chris Vandomelen <chrisv@b0rked.dhs.org>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.2
--------------------------------------------------------------------------------
-EXTENSION:           swf
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
-COMMENT:             Only for Unix (won't change)
--------------------------------------------------------------------------------
-EXTENSION:           sysvsem
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           sysvshm
-MAINTENANCE:         Unknown
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           vpopmail
-MAINTENANCE:         Unknown
-STATUS:              Experimental
-SINCE:               4.0.5
--------------------------------------------------------------------------------
-EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           xml
-PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           yaz
-PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
-MAINTENANCE:         Maintained
-STATUS:              Unknown
-SINCE:               4.0.1
--------------------------------------------------------------------------------
-EXTENSION:           yp
-MAINTENANCE:         Unknown
-STATUS:              Unknown
--------------------------------------------------------------------------------
-EXTENSION:           zlib
-PRIMARY MAINTAINER:  Stefan Roehrich <sr@linux.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           zziplib
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
-SINCE:               4.0.5
--------------------------------------------------------------------------------
-# iptc?

EXTENSION_STATUS

@@ -0,0 +1,54 @@
+The core of PHP 3.0 is considered to be stable at this time.  However, some of
+the modules that are bundled with it are still undergoing development, or
+contain known bugs.  The purpose of this file is to document the status of
+each module (extension).  Patches to unstable modules will be available through
+the CVS, and through periodic maintenance releases.
+
+Stability scale:
+Rock solid - We believe it's safe to base a production site on it.
+Stable     - It should be safe to base a production site on it.
+             Isn't rated as rock-solid because it contained problems
+             in the not-so-far past, or doesn't have enough users
+             to test it to know it's rock solid.
+Beta       - This module probably contains bugs, sometimes even known
+             bugs.  You can give it a try and there's a good chance
+             it'll work fine, but it might not be a good idea to base
+             a production site on it.
+Alpha      - This module is in initial development steps.  Don't trust
+             it, play with it at your own risk.
+Deprecated - This module is only available for downwards compatability,
+             and will not be supported in any way.  The code quality
+             is usually around the Beta status.
+             
+The standard disclaimers apply, that is, if a rock-solid module blows up on
+you and ruins your site, nobody in the PHP development team is responsible.
+We'll probably try to help, though.
+
+
+Extension Name            Status            Comments
+-----------------------------------------------------------------------------
+DBM                     Rock Solid      That relies on a working DBM library.
+                                        The flatfile support is probably not
+                                        as stable.
+MySQL                   Rock Solid
+mSQL                    Rock Solid
+Sybase DB               Stable
+Sybase CT               Stable
+BC Math                 Rock Solid      Arbitary precision math library
+Postgres SQL            Stable          Postgres 6.2 and earlier is stable,
+                                        but problems were reported with 6.3
+Debugger                Beta
+Unified ODBC            Beta
+Solid                   Deprecated      Replaced by Unified ODBC
+iODBC                   Deprecated      Replaced by Unified ODBC
+Adabas                  Deprecated      Replaced by Unified ODBC
+LDAP                    Stable          Lightweight Directory Access Protocol.
+dBase
+FilePro
+Oracle                  Beta            Not tested thoroughly enough.
+IMAP                    Beta            Bundled in the dl/ directory
+SNMP                    Stable          Very solid, but also very limited.
+                                        Only supports GET and WALK requests.
+Raima Velocis           Beta            If use with Unified ODBC, replaced
+                                        by Unified ODBC
+Raima Velocis           Alpha           If use without Unified ODBC

INSTALL

@@ -1,173 +1,57 @@
-Installation Instructions for PHP 4.0
--------------------------------------
+Installation Instructions for PHP3
+----------------------------------
 
-For the impatient here is a quick set of steps that will build PHP as
-first a dynamic Apache module (DSO) for Apache 1.3.x with MySQL support 
-and then a static module.  A more verbose explanation follows.  
-
-For installing PHP on other web servers, refer to one of the following
-files:
-
-    sapi/aolserver/README
-    sapi/pi3web/README
-    sapi/servlet/README
-    sapi/thttpd/README
-    README.Zeus
-
-Note!  Only install either the static module or the dynamic one.  Do not
-install both.  
-
-Note 2!  If you are recompiling PHP to add new extensions or upgrading
-something like GD, remove the config.cache file before you re-run 
-configure.
-
-Note 3!  If you are on Linux and have installed shared libraries, make
-sure the location of these shared libraries are listed in your 
-/etc/ld.so.conf file.  For example, if you have:
-
-  /usr/local/lib/mysql/libmysqlclient.so
-
-Make sure /etc/ld.so.conf contains:
-
-  /usr/local/lib/mysql
-
-Then run ldconfig.
-
-If you want both PHP 3 and 4 modules in the same Apache server, check the
-bottom of this file for instructions.
-
-INSTALLATION WITH THE ZEUS WEB SERVER:
---Please see the 'README.Zeus' file included in this distribution
+For the impatient here is a quick set of steps that will build PHP3
+as an Apache module for Apache 1.3.0 with MySQL support.  A more verbose 
+explanation follows.
 
 
-QUICK INSTALL (DSO)
+QUICK INSTALL
 
-For this to work your Apache httpd must have mod_so enabled.
-Check using httpd -l.  You should see something like:
-
-Compiled-in modules:
-  http_core.c
-  mod_so.c
-
-Chances are you will see a lot more modules than these two. That's ok, 
-as long as mod_so.c shows up you can proceed with the following steps:
-
-$ gunzip -c php-4.0.x.tar.gz | tar xf -
-$ cd php-4.0.x
-$ ./configure --with-mysql --with-apxs
-$ make
-$ make install
-
-If you get an error telling you that the apxs script could not be found,
-look for it on your system and if you find it, provide the full path to it
-as: --with-apxs=/path/to/apxs
-
-Next you must copy php.ini-dist to the appropriate place (normally
-/usr/local/lib/php.ini) and edit it as necessary to set PHP options.
-
-The only thing left to do is to edit your httpd.conf file and make sure the
-PHP 4 mime type is there and uncommented.  You need a line that looks like
-this:
-
-   AddType application/x-httpd-php .php
-
-Then restart your server (apachectl restart) and you should be able to
-serve up PHP files now.  Make a test file called test.php and put some 
-PHP tags in it.  Like <?phpinfo()?>, for example.
-
-
-QUICK INSTALL (Static)
-
-$ gunzip -c apache_1.3.x.tar.gz | tar xf -
-$ cd apache_1.3.x
-$ ./configure
-$ cd ..
-
-$ gunzip -c php-4.0.x.tar.gz | tar xf -
-$ cd php-4.0.x
-$ ./configure --with-mysql --with-apache=../apache_1.3.x --enable-track-vars
-$ make
-$ make install
-
-$ cd ../apache_1.3.x
-$ ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a
- (The above line is correct!  Yes, we know libphp4.a does not exist at this
+gunzip apache_1.3.x.tar.gz
+tar xvf apache_1.3.x.tar
+gunzip php-3.0.x.tar.gz
+tar xvf php-3.0.x.tar
+cd apache_1.3.x
+./configure --prefix=/www
+cd ../php-3.0.x
+./configure --with-mysql --with-apache=../apache_1.3.x --enable-track-vars
+make
+make install
+cd ../apache_1.3.x
+./configure --prefix=/www --activate-module=src/modules/php3/libphp3.a
+ (The above line is correct!  Yes, we know libphp3.a does not exist at this
   stage.  It isn't supposed to.  It will be created.)
-$ make
- (you should now have an httpd binary which you can copy to your Apache bin dir if
-  is is your first install then you need to "make install" as well)
-$ cd ../php-4.0.x
-$ cp php.ini-dist /usr/local/lib/php.ini
-You can edit /usr/local/lib/php.ini file to set PHP options.
+make
+ (you should now have an httpd binary which you can copy to your Apache bin dir)
+cd ../php-3.0.x
+cp php3.ini-dist /usr/local/lib/php3.ini
+You can edit /usr/local/lib/php3.ini file to set PHP options.
 Edit your httpd.conf or srm.conf file and add:
-  AddType application/x-httpd-php .php
+  AddType application/x-httpd-php3 .php3
 
 
 VERBOSE INSTALL
 
-Chances are you are reading this because the quick install steps above
-did not work for you.  If this is the case, congratulations, you are
-among the elite few that actually reads documentation.  It really is
-not a difficult install and once you have done it once you will fly 
-through it.
-
-Installing PHP can be done in four simple steps:
+Installing PHP3 can be done in four simple steps:
 
 1. Unpack your distribution file.  
 
-   You will have downloaded a file named something like php-4.0.x.tar.gz.
-   Unzip this file with a command like: gunzip php-4.0.x.tar.gz
+   You will have downloaded a file named something like php3xn.tar.gz.
+   Unzip this file with a command like: gunzip php3xn.tar.gz
 
-   Next you have to untar it with: tar -xvf php-4.0.x.tar
+   Next you have to untar it with: tar -xvf php3xn.tar
 
-   This will create a php-4.0.x directory.  cd into this new directory.
+   This will create a php-3.0.x directory.  cd into this new directory.
 
-2a. Configure PHP (Dynamic Module) - Skip to 2b if you wish to build
-    a static module
+2. Configure PHP3.
 
    You now have to choose the options you would like.  There are quite
    a few of them.  To see a list, type: ./configure --help
 
-   The only options that you are likely to want to use are the ones in
-   the last section entitled, "--enable and --with options recognized:"
-
-   A popular choice is to build the Apache module version.  In order to
-   build PHP as a dynamic module for Apache-1.3.x you have to first have
-   Apache installed.  Assuming Apache is already installed, make sure
-   the shared object module is enabled.  To check this, type: httpd -l
-   You should see something like:
-
-     Compiled-in modules:
-       http_core.c
-       mod_so.c
-
-   You will most likely have a lot more modules than what is shown here.
-   As long as mod_so.c shows up in the list, PHP should be happy.
-
-   Now, type: ./configure --with-mysql --with-apxs
-
-   If you get an error telling you that the apxs script could not be found,
-   look for it on your system and if you find it, provide the full path to it
-   as: --with-apxs=/path/to/apxs
-
-   You might also want other flags on this configure line.  --with-mysql
-   is just an example.  
-
-   There are a few things that can go wrong during this configure step.
-   The most common is that you have asked for an option and that the
-   configure script can not find the files required to enable this 
-   option in PHP.  Chances are you can provide the full path to the
-   base directory under which the related files were installed.  For
-   example, if you have installed the GD library in /opt/gd which means
-   that /opt/gd/include has your GD header files and /opt/gd/lib contains
-   your GD library files, you would use --with-gd=/opt/gd
-
-   Skip to step 3 for compilation and installation instructions.
-
-2b. Configure PHP (Static Module) - Skip if you performed 2a
-
-   You now have to choose the options you would like.  There are quite
-   a few of them.  To see a list, type: ./configure --help
+   You can also use the supplied 'setup' script, which will ask you
+   a series of questions and automatically run the configure script
+   for you.
 
    The only options that you are likely to want to use are the ones in
    the last section entitled, "--enable and --with options recognized:"
@@ -194,18 +78,10 @@ Installing PHP can be done in four simple steps:
    Apache Configure script at least once before compiling PHP.  It 
    doesn't matter how you have Apache configured at this point.
 
-   Skip to step 3b at this point.
-
 3. Compile and install the files.  Simply type: make install
 
-3a.   Dynamic Module Installation
-
-   Nothing else is needed here.  Proceed to step 4a.
-
-3b.   Static Module Installation
-
    For the Apache module version this will copy the appropriate files
-   to the src/modules/php4 directory in your Apache distribution if
+   to the src/modules/php3 directory in your Apache distribution if
    you are using Apache 1.3.x.  If you are still running Apache 1.2.x
    these files will be copied directly to the main src directory.
 
@@ -214,7 +90,7 @@ Installing PHP can be done in four simple steps:
 
        cd apache_1.3.x
        ./configure --prefix=/<path>/apache \
-                   --activate-module=src/modules/php4/libphp4.a
+                   --activate-module=src/modules/php3/libphp3.a
        make
        make install
 
@@ -227,29 +103,29 @@ Installing PHP can be done in four simple steps:
 
    For Apache 1.3.x add:
 
-      AddModule modules/php4/libphp4.a
+      AddModule modules/php3/libphp3.a
 
    For Apache 1.3.x don't do anything else.  Just add this line and then
    run "./Configure" followed by "make".
 
    For Apache 1.2.x add:
 
-      Module php4_module mod_php4.o
+      Module php3_module mod_php3.o
 
-   For Apache 1.2.x you will also have to look in the libphp4.module file,
+   For Apache 1.2.x you will also have to look in the libphp3.module file,
    which was copied to the src directory. The EXTRA_LIBS line in the Apache
    Configuration file needs to be set to use the same libs as specified on
-   the LIBS line in libphp4.module. You also need to make sure to add
+   the LIBS line in libphp3.module. You also need to make sure to add
    "-L." to the beginning of the EXTRA_LIBS line.
 
    So, as an example, your EXTRA_LIBS line might look like:
 
-	EXTRA_LIBS=-L. -lphp4 -lgdbm -ldb -L/usr/local/mysql/lib -lmysqlclient
+	EXTRA_LIBS=-L. -lphp3 -lgdbm -ldb -L/usr/local/mysql/lib -lmysqlclient
 
    NOTE: You should not enclose the EXTRA_LIBS line in double-quotes, as it
-   is in the libphp4.module file.
+   is in the libphp3.module file.
 
-   Also, look at the RULE_WANTHSREGEX setting in the libphp4.module file 
+   Also, look at the RULE_WANTHSREGEX setting in the libphp3.module file 
    and set the WANTHSREGEX directive accordingly in your Configuration file.
    This last step applies to versions of Apache prior to 1.3b3.
 
@@ -261,146 +137,23 @@ Installing PHP can be done in four simple steps:
    somewhere.  Re-edit Configuration and try again.  If it goes well,
    type: make
 
-   Assuming it compiles without errors, proceed to step 4b.
-
-4a. Setting up the server. (Dynamic Module)
-
-   The make install command in step 3 should have done most of your
-   work for you.  It actually edits your httpd.conf file and tries to
-   enable the dynamic PHP module.  To verify this, look for a line that
-   looks like this:
-
-      LoadModule php4_module libexec/libphp4.so
-
-   The actual path before the libphp4.so part might differ slightly.  This
-   is likely fine.  If you are paranoid you can examine the output from the
-   make install step to see where the libphp4.so file was actually put and
-   place the full path to this file on this LoadModule line.
-
-   If somewhere in your httpd.conf file you have a ClearModuleList line
-   then you also need this line:
-
-      AddModule mod_php4.c
-
-   And finally you need to tell Apache which file extension should trigger
-   PHP.  You do this by creating a special mime type and associating it
-   with an extension.  We suggest using:
-
-      AddType application/x-httpd-php .php
-  
-   You are however free to use any extension you wish, including .html.
-
-   Note!  If a line has a # at the beginning, then it is commented out
-   and you need to remove the # for that line to take effect.
-
-   Finally you need to copy php.ini-dist to the appropriate place
-   (normally /usr/local/lib/php.ini) and edit if necessary.
-
-   Once you have made these changes you should be ready to restart your
-   server and try it out.  Type: apachectl restart
-   
-4b. Setting up the server. (Static Module)
+4. Setting up the server.
    
    You should now have a new httpd binary.  Shut down your existing server,
    if you have one, and copy this new binary overtop of it.  Perhaps make
-   a backup of your previous one first.  Then edit your conf/httpd.conf file
+   a backup of your previous one first.  Then edit your conf/srm.conf file
    and add the line:
 
-      AddType application/x-httpd-php .php
+      AddType application/x-httpd-php3 .php3
 
    There is also an interesting feature which can be quite instructive and
    helpful while debugging.  That is the option of having colour syntax
    highlighting.  To enable this, add the following line:
 
-      AddType application/x-httpd-php-source .phps
+      AddType application/x-httpd-php3-source .phps
 
    Any file ending in .phps will now be displayed with full colour syntax
    highlighting instead of being executed.
 
-   Note that on some older server setups, the AddType lines are in the
-   conf/srm.conf file instead of conf/httpd.conf.
-
-   Note!  If a line has a # at the beginning, then it is commented out
-   and you need to remove the # for that line to take effect.
-
-   When you are finished making changes to your httpd.conf file, you need
-   to copy php.ini-dist to the appropriate place (normally
-   /usr/local/lib/php.ini) and edit if necessary. You can then
+   When you are finished making changes to your srm.conf file, you can
    start up your server.
-
-5. Testing it all worked
-
-   Create a test file named test.php in your web tree somewhere and
-   put some test PHP tags in it.  <?phpinfo()?> is a good first test.
-   This tag tells PHP to do a braindump and tells you all sorts of things
-   about itself.  
-
-
-WHY DISABLING -fPIC WORKS ON LINUX
-
-    From: Martin v. Loewis <martin@loewis.home.cs.tu-berlin.de>
-    To: glibc-linux@ricardo.ecn.wfu.edu
-    Subject: Re: Shared library -shared vs. -fpic
-
-    [In reply to Kaz Kylheku <kaz@ashi.footprints.net>]
-
-    > PIC stands for Position-Independent Code. 
-
-    Correct.
-
-    > Code isn't position-independent (or ``relocatable'') cannot be
-    > loaded at an arbitrary address;
-
-    Wrong.
-
-    > it requires some references to be patched at load time.
-
-    Correct.
-
-    > Shared libraries need to be relocatable because it's not known
-    > beforehand what address they will be loaded at
-
-    Correct, depending on the meaning of "relocatable". PIC code typically
-    does not contain relocations; that's why its position-independent.
-
-    > Just because you don't specify -fPIC doesn't mean that the compiler
-    > won't emit position-independent code; the option prevents it from
-    > emitting position-dependent code in situations where it otherwise
-    > would.
-
-    Correct. However, a non-trivial shared library typically won't be
-    position-independent unless explicitly compiled with
-    -fPIC. Linux/glibc indeed does not require a shared library to be
-    position-independent; instead, it will perform the relocations in the
-    binary, even if they refer to code pages. As a result, those relocated
-    pages won't be shared across processes, anymore.
-
-    Regards,
-    Martin
-
-USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
-
-   Recent operating systems provide the ability to perform versioning and
-   scoping. This features make it possible to let PHP 3 and PHP 4 run as
-   concurrent modules in one Apache server. 
-   
-   This feature is known to work on the following platforms:
-
-   - Linux with recent binutils (binutils 2.9.1.0.25 tested)
-   - Solaris 2.5 or better
-   - FreeBSD (3.2, 4.0 tested)
-   - IRIX64 6.5
-   
-   To enable it, configure PHP 3 and PHP 4 to use APXS (--with-apxs) and the
-   necessary link extensions (--enable-versioning). Otherwise, all standard
-   installations instructions apply. For example:
-
-   		$ ./configure \
-				--with-apxs=/apache/bin/apxs \
-				--enable-versioning \
-				--with-mysql \
-				--enable-track-vars
-
-   If this also works on your platform or if you know a way to do it, please
-   report it to our bug database at http://bugs.php.net
-

LICENSE

@@ -1,75 +1,64 @@
--------------------------------------------------------------------- 
-                  The PHP License, version 2.02
-Copyright (c) 1999, 2000 The PHP Group. All rights reserved.
--------------------------------------------------------------------- 
+  -------------------------------------------------------------------- 
+   Copyright (c) 1998 The PHP Development Team.  All rights reserved.
+  -------------------------------------------------------------------- 
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
 
-Redistribution and use in source and binary forms, with or without
-modification, is permitted provided that the following conditions
-are met:
+  1. Commercial redistribution of larger works derived from, or 
+     works which bundle PHP, requires written permission from the
+     PHP Development Team.  You may charge a fee for the physical
+     act of transferring a copy, and must make it clear that the
+     fee being charged is for the distribution, and not for the
+     software itself.  You may, at your option, offer warranty
+     protection in exchange for a fee.
 
-  1. Redistributions of source code must retain the above copyright
+  2. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer. 
  
-  2. Redistributions in binary form must reproduce the above 
+  3. Redistributions in binary form must reproduce the above 
      copyright notice, this list of conditions and the following 
      disclaimer in the documentation and/or other materials provided
      with the distribution.
  
-  3. The name "PHP" must not be used to endorse or promote products 
-     derived from this software without prior permission from the 
-     PHP Group.  This does not apply to add-on libraries or tools
-     that work in conjunction with PHP.  In such a case the PHP
-     name may be used to indicate that the product supports PHP.
+  4. All advertising materials mentioning features or use of this
+     software must display the following acknowledgment:
+     "This product includes software written by the PHP Development
+      Team"
  
-  4. The PHP Group may publish revised and/or new versions of the
-     license from time to time. Each version will be given a
-     distinguishing version number.
-     Once covered code has been published under a particular version
-     of the license, you may always continue to use it under the
-     terms of that version. You may also choose to use such covered
-     code under the terms of any subsequent version of the license
-     published by the PHP Group. No one other than the PHP Group has
-     the right to modify the terms applicable to covered code created
-     under this License.
-
-  5. Redistributions of any form whatsoever must retain the following
+  5. The name "PHP" must not be used to endorse or promote products 
+     derived from this software without prior written permission
+     from the PHP Development Team.  This does not apply to add-on
+     libraries or tools that work in conjunction with PHP.  In such
+     a case the PHP name may be used to indicate that the product
+     supports PHP.
+ 
+  6. Redistributions of any form whatsoever must retain the following
      acknowledgment:
-     "This product includes PHP, freely available from
-     http://www.php.net/".
+     "This product includes software written by the PHP Development
+      Team". 
+ 
+  THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+  ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+  DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
 
-  6. The software incorporates the Zend Engine, a product of Zend
-     Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
-     PHP Association (pursuant to a grant from Zend that can be
-     found at http://www.php.net/license/ZendGrant/) for
-     distribution to you under this license agreement, only as a
-     part of PHP.  In the event that you separate the Zend Engine
-     (or any portion thereof) from the rest of the software, or
-     modify the Zend Engine, or any portion thereof, your use of the
-     separated or modified Zend Engine software shall not be governed
-     by this license, and instead shall be governed by the license
-     set forth at http://www.zend.com/license/ZendLicense/. 
+  -------------------------------------------------------------------- 
 
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the PHP Development Team.
 
-
-THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
-ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
-DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
--------------------------------------------------------------------- 
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the PHP Group.
-
-The PHP Group can be contacted via Email at group@php.net.
-
-For more information on the PHP Group and the PHP project, 
-please see <http://www.php.net>.
+  The PHP Development Team can be contacted via Email at core@php.net.
+  
+  For more information on the PHP Development Team and the PHP 
+  project, please see <http://www.php.net>.
+ 

Makefile.in

@@ -1,56 +1,889 @@
+# +----------------------------------------------------------------------+
+# | PHP HTML Embedded Scripting Language Version 3.0                     |
+# +----------------------------------------------------------------------+
+# | Copyright (c) 1997,1998 PHP Development Team (See Credits file)      |
+# +----------------------------------------------------------------------+
+# | This program is free software; you can redistribute it and/or modify |
+# | it under the terms of one of the following licenses:                 |
+# |                                                                      |
+# |  A) the GNU General Public License as published by the Free Software |
+# |     Foundation; either version 2 of the License, or (at your option) |
+# |     any later version.                                               |
+# |                                                                      |
+# |  B) the PHP License as published by the PHP Development Team and     |
+# |     included in the distribution in the file: LICENSE                |
+# |                                                                      |
+# | 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 both licenses referred to here.   |
+# | If you did not, or have any questions about PHP licensing, please    |
+# | contact core@php.net.                                                |
+# +----------------------------------------------------------------------+
 
-ZEND_DIR = $(srcdir)/Zend
-SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+#
+# $Id$
+#
 
-LTLIBRARY_NAME = libphp4.la
-LTLIBRARY_SOURCES = stub.c
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+srcdir = @srcdir@
+VPATH = @srcdir@
+bindir = @bindir@
+ZEND_DIR = $(srcdir)/libzend
 
-LTLIBRARY_DEPENDENCIES = \
-		Zend/libZend.la \
-		sapi/$(PHP_SAPI)/libsapi.la \
-		main/libmain.la \
-		$(REGEX_LIB) \
-		$(EXT_LTLIBS) \
-		$(TSRM_LIB)
+CC = @CC@
+AR = ar rc
+BINNAME = @BINNAME@
+INSTALL_IT = @INSTALL_IT@
+INCLUDE = -I$(srcdir) -I. -I$(ZEND_DIR) @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@
+PROF_CFLAGS =
+CFLAGS_SHLIB = @CFLAGS_SHLIB@
+LDFLAGS_SHLIB = @LDFLAGS_SHLIB@
+LDFLAGS_SHLIB_EXPORT = @LDFLAGS_SHLIB_EXPORT@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) @DEBUG_CFLAGS@ @STRONGHOLD@ $(PROF_CFLAGS)
+LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT) -L$(ZEND_DIR)
+REGCFLAGS = $(CFLAGS)
+RANLIB = @RANLIB@
+YACC = @YACC@
+MAINT = @MAINT@
+APXS = @APXS@
+APXS_LDFLAGS = @APXS_LDFLAGS@
+WARNING_LEVEL = @WARNING_LEVEL@
 
-LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \
+       configuration-parser.c configuration-scanner.c request_info.c \
+       safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \
+       php_ini.c
+OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
+       configuration-parser.o configuration-scanner.o request_info.o \
+       safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \
+       php_ini.o
 
-PROGRAM_NAME         = php
-PROGRAM_SOURCES      = stub.c
-PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
-PROGRAM_LDFLAGS      = -export-dynamic	
-PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
+FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
+       functions/basic_functions.c \
+       functions/crypt.c functions/datetime.c functions/db.c \
+       functions/dbase.c functions/dir.c \
+       functions/dl.c functions/dns.c functions/exec.c functions/file.c \
+       functions/filepro.c functions/filestat.c \
+       functions/formatted_print.c functions/fsock.c functions/gd.c \
+       functions/head.c functions/html.c functions/image.c functions/imap.c\
+       functions/link.c functions/mail.c functions/math.c functions/iptc.c \
+       functions/md5.c functions/microtime.c functions/mime.c \
+       functions/msql.c functions/mysql.c \
+       functions/oracle.c functions/oci8.c functions/pack.c \
+       functions/pageinfo.c functions/pgsql.c \
+       functions/post.c functions/rand.c functions/reg.c \
+       functions/solid.c functions/soundex.c \
+       functions/string.c functions/syslog.c functions/type.c \
+       functions/uniqid.c functions/sybase.c \
+       functions/sybase-ct.c functions/url.c functions/base64.c \
+       functions/info.c @BCMATH_SRC@ functions/xml.c \
+       functions/unified_odbc.c functions/ldap.c functions/browscap.c \
+       functions/velocis.c functions/gdttf.c functions/gdcache.c \
+       functions/zlib.c functions/COM.c functions/ifx.c \
+       functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \
+       functions/fdf.c \
+       functions/snmp.c functions/var.c functions/interbase.c \
+       functions/quot_print.c functions/cyr_convert.c \
+       functions/sysvsem.c functions/sysvshm.c functions/dav.c
 
-targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
+FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
 
-install_targets = install-sapi install-modules
+LIBS = $(PHPLIBS)  @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
 
-include $(top_srcdir)/build/rules.mk
-include $(top_srcdir)/build/library.mk
-include $(top_srcdir)/build/program.mk
+all: $(BINNAME)
 
-install-sapi:
-	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-	-@$(mkinstalldirs) $(bindir)
-	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
-		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
-				break; \
-			fi; \
-		done; \
-	fi
+php: $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ $(ZEND_DIR)/libzend.a
+	$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
+
+libphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(RANLIB) $(BINNAME)
+
+libmodphp3.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(RANLIB) $(BINNAME)
+
+libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(RANLIB) libmodphp3-so.a
+
+libphp3.so: mod_php3.c libmodphp3-so.a
+	$(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a
+
+docs:
+	cd doc; $(MAKE)
+
+regex/libregex.a:
+	(cd regex; $(MAKE) lib)
+
+dbase/libdbf.a:
+	(cd dbase; $(MAKE))
+
+functions/ifx.c: functions/ifx.ec
+	(if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi)
+
+configuration-parser.h configuration-parser.c:	$(srcdir)/configuration-parser.y
+	bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c
+
+configuration-scanner.o:
+	$(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c configuration-scanner.c
+
+configuration-scanner.c:	$(srcdir)/configuration-scanner.l
+	flex -Pcfg -oconfiguration-scanner.c -i $(srcdir)/configuration-scanner.l
+
+clean:  
+	-rm -f libphp3.a libmodphp3.a php *.o
+	-rm -f $(FUNCTIONS) functions/ifx.c
+	-rm -f test/php.desc test/php.in test/php.out test/php.test
+	-rm -f test/a.tmp test/b.tmp test/test.dbm*
+	(cd dbase; $(MAKE) clean)
+
+distclean: clean
+	-rm -f *-parser.[ch] *-scanner.c *.output
+	-rm -f config.status config.cache config.log
+	-rm -f Makefile Makefile.depend config.h build-defs.h
+	-rm -f libphp3.module stamp-h
+	-rm -f regex/*.o regex/*.a regex/*.ih
+	-rm -f dbase/*.o dbase/*.a
+	-rm -f doc/checkdoc doc/funcparse doc/version.ent
+	-rm -f do-conf test/test.log extra/gd/bdf2gdfont
+	-rm -f doc/Makefile regex/Makefile dbase/Makefile
+
+bench: $(BINNAME)
+	./$(BINNAME) -c. tests/bench.phtml
+
+# can't use a single rule for this because 'test' is a directory
+test: regression
+regression check: $(BINNAME)
+	cd test && ./testall
+
+config.status: configure
+	./config.status --recheck
+
+build-defs.h config.h: stamp-h
+stamp-h: config.h.in config.status
+	CONFIG_FILES='build-defs.h stamp-h' ./config.status
+
+Makefile: Makefile.in config.status
+	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+
+#
+# You must use '--enable-maintainer-mode' with configure to enable
+# these rules, which requires autoconf be installed.
+#
+configure: @MAINT@ configure.in aclocal.m4
+	cd $(srcdir) && autoconf
+
+config.h.in: @MAINT@ stamp-h.in
+stamp-h.in: configure.in aclocal.m4 acconfig.h
+	cd ${srcdir} && autoheader && touch ${srcdir}/stamp-h.in
+
+install: $(BINNAME)
 	$(INSTALL_IT)
 
-install-modules:
-	@test -d modules && \
-	$(mkinstalldirs) $(moduledir) && \
-	echo "installing shared modules into $(moduledir)" && \
-	rm -f modules/*.la && \
-	cp modules/* $(moduledir) >/dev/null 2>&1 || true
+indent:	clean
+	indent -v -kr -cli4 -ts4 \
+	-T pval -T HashTable -T Bucket -T Token -T TokenCache -T TokenCacheManager \
+	-T switch_expr -T internal_function -T control_structure_data \
+	-T MemoryHashTable -T MemoryBucket \
+	-T pvalue_value -T Stack *.c *.h functions/*.c functions/*.h
+	rm -f *~ functions/*~
 
-install-su: install-modules
-	(cd pear && $(MAKE) install)
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+	@bn=`echo $@ | sed -e 's#functions/##'`; test -f $@ || \
+	  (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@)
 
-.NOEXPORT:
+functions/number.o: functions/number.c
+	$(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c $< -o $@
+	@bn=`echo $@ | sed -e 's#functions/##'`; test -f $@ || \
+	  (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@)
+
+parser-scanner:	configuration-parser.c configuration-scanner.c
+
+depend:	parser-scanner
+	$(CC) $(CFLAGS) -MM $(SOURCE) | perl -pe 's|regex/regex.h||;' > Makefile.depend
+	$(CC) $(CFLAGS) -MM $(FUNCTIONS_SOURCE) | perl -pe 's|^(.+\.o)|functions/$$1|; s|regex/regex.h||;' >> Makefile.depend
+
+main.o: main.c php.h php_version.h libzend/zend.h libzend/config.h \
+ libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
+ libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
+ libzend/modules.h libzend/zend_list.h config.h request_info.h \
+ php3_compat.h libzend/zend_stack.h  safe_mode.h \
+ fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
+ php_ini.h php_globals.h main.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h control_structures.h \
+ functions/basic_functions.h libzend/zend_highlight.h functions/info.h \
+ functions/head.h functions/post.h functions/type.h snprintf.h \
+ libzend/zend_indent.h logos.h
+internal_functions.o: internal_functions.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h internal_functions_registry.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_execute.h functions/php3_ifx.h \
+ functions/php3_ldap.h functions/php3_mysql.h functions/php3_bcmath.h \
+ functions/php3_msql.h functions/basic_functions.h \
+ libzend/zend_highlight.h functions/phpmath.h functions/php3_string.h \
+ functions/php3_oci8.h functions/oracle.h functions/base64.h \
+ functions/php3_dir.h functions/dns.h functions/php3_pgsql.h \
+ functions/php3_velocis.h functions/php3_sybase.h \
+ functions/php3_sybase-ct.h functions/reg.h functions/php3_mail.h \
+ functions/imap.h functions/md5.h functions/global.h \
+ functions/php3_gd.h functions/html.h functions/dl.h functions/head.h \
+ functions/post.h functions/exec.h functions/php3_solid.h \
+ functions/adabasd.h functions/file.h functions/dbase.h functions/hw.h \
+ functions/filepro.h functions/db.h functions/php3_syslog.h \
+ functions/php3_filestat.h functions/php3_browscap.h functions/pack.h \
+ functions/php3_unified_odbc.h dl/snmp/php3_snmp.h \
+ functions/php3_zlib.h functions/php3_COM.h functions/php3_interbase.h \
+ functions/php3_xml.h functions/php3_pdf.h functions/php3_fdf.h \
+ functions/php3_sysvsem.h functions/php3_sysvshm.h \
+ functions/php3_dav.h
+snprintf.o: snprintf.c config.h
+php3_sprintf.o: php3_sprintf.c config.h
+configuration-parser.o: configuration-parser.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h php_globals.h php_ini.h functions/dl.h \
+ functions/file.h functions/php3_browscap.h libzend/zend_extensions.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_execute.h
+configuration-scanner.o: configuration-scanner.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h configuration-parser.h
+request_info.o: request_info.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+safe_mode.o: safe_mode.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/pageinfo.h
+fopen-wrappers.o: fopen-wrappers.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ php3_realpath.h functions/head.h functions/url.h functions/base64.h \
+ functions/fsock.h functions/php3_string.h libzend/zend_compile.h \
+ libzend/zend-parser.h libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_execute.h
+php3_realpath.o: php3_realpath.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+alloca.o: alloca.c
+output.o: output.c php.h php_version.h libzend/zend.h libzend/config.h \
+ libzend/config.unix.h libzend/zend_errors.h libzend/zend_alloc.h \
+ libzend/zend_hash.h libzend/zend_llist.h libzend/zend_API.h \
+ libzend/modules.h libzend/zend_list.h config.h request_info.h \
+ php3_compat.h libzend/zend_stack.h  safe_mode.h \
+ fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h
+php_ini.o: php_ini.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ php_globals.h
+functions/adabasd.o: functions/adabasd.c config.h build-defs.h php.h \
+ php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/php3_string.h functions/head.h \
+ functions/adabasd.h
+functions/apache.o: functions/apache.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ php_globals.h php_ini.h mod_php3.h
+functions/fhttpd.o: functions/fhttpd.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+functions/basic_functions.o: functions/basic_functions.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h php_ini.h internal_functions_registry.h \
+ functions/basic_functions.h libzend/zend_highlight.h \
+ functions/phpmath.h functions/php3_string.h functions/dns.h \
+ functions/md5.h functions/global.h functions/html.h functions/post.h \
+ functions/exec.h functions/info.h functions/url.h \
+ functions/datetime.h functions/fsock.h functions/image.h \
+ functions/php3_link.h functions/php3_filestat.h functions/microtime.h \
+ functions/pageinfo.h functions/uniqid.h functions/base64.h \
+ functions/php3_mail.h functions/php3_var.h functions/php3_iptc.h \
+ functions/quot_print.h functions/cyr_convert.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h php_globals.h
+functions/crypt.o: functions/crypt.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h
+functions/datetime.o: functions/datetime.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/datetime.h snprintf.h php_globals.h
+functions/db.o: functions/db.c
+functions/dbase.o: functions/dbase.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h
+functions/dir.o: functions/dir.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_dir.h
+functions/dl.o: functions/dl.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/dl.h \
+ php_globals.h
+functions/dns.o: functions/dns.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/dns.h
+functions/exec.o: functions/exec.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h functions/head.h functions/exec.h \
+ php_globals.h
+functions/file.o: functions/file.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_string.h functions/file.h snprintf.h functions/fsock.h \
+ php_globals.h
+functions/filepro.o: functions/filepro.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ functions/filepro.h
+functions/filestat.o: functions/filestat.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_globals.h \
+ functions/php3_filestat.h
+functions/formatted_print.o: functions/formatted_print.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/head.h functions/php3_string.h \
+ libzend/zend_execute.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h
+functions/fsock.o: functions/fsock.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/base64.h \
+ functions/file.h functions/post.h functions/url.h functions/fsock.h \
+ build-defs.h
+functions/gd.o: functions/gd.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_gd.h
+functions/head.o: functions/head.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/php3_string.h functions/pageinfo.h main.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
+ functions/datetime.h functions/head.h functions/post.h php_globals.h \
+ functions/url.h
+functions/html.o: functions/html.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/html.h
+functions/image.o: functions/image.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/image.h
+functions/imap.o: functions/imap.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+functions/link.o: functions/link.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_filestat.h php_globals.h functions/php3_link.h
+functions/mail.o: functions/mail.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h build-defs.h \
+ functions/php3_mail.h php_ini.h
+functions/math.o: functions/math.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h \
+ snprintf.h
+functions/iptc.o: functions/iptc.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_iptc.h
+functions/md5.o: functions/md5.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/md5.h \
+ functions/global.h
+functions/microtime.o: functions/microtime.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/microtime.h snprintf.h
+functions/mime.o: functions/mime.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/type.h \
+ functions/post.h functions/mime.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h php_globals.h
+functions/msql.o: functions/msql.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_msql.h functions/reg.h functions/php3_string.h \
+ php_globals.h
+functions/mysql.o: functions/mysql.c config.h build-defs.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h php_globals.h functions/php3_string.h \
+ functions/php3_mysql.h php_ini.h
+functions/oracle.o: functions/oracle.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/oracle.h
+functions/oci8.o: functions/oci8.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_oci8.h
+functions/pack.o: functions/pack.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_string.h functions/pack.h snprintf.h functions/fsock.h
+functions/pageinfo.o: functions/pageinfo.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/pageinfo.h
+functions/pgsql.o: functions/pgsql.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_pgsql.h functions/php3_string.h php_globals.h
+functions/post.o: functions/post.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/mime.h \
+ functions/type.h functions/php3_string.h functions/post.h \
+ functions/url.h php_globals.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h
+functions/rand.o: functions/rand.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/phpmath.h
+functions/reg.o: functions/reg.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h functions/reg.h
+functions/solid.o: functions/solid.c config.h build-defs.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/php3_solid.h
+functions/soundex.o: functions/soundex.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_string.h
+functions/string.o: functions/string.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/post.h functions/php3_string.h libzend/zend_execute.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h php_globals.h
+functions/syslog.o: functions/syslog.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h \
+ functions/php3_syslog.h
+functions/type.o: functions/type.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/type.h
+functions/uniqid.o: functions/uniqid.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/uniqid.h
+functions/sybase.o: functions/sybase.c config.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/php3_sybase.h \
+ functions/php3_string.h php_globals.h
+functions/sybase-ct.o: functions/sybase-ct.c config.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/php3_sybase-ct.h \
+ functions/php3_string.h php_globals.h
+functions/url.o: functions/url.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/url.h
+functions/base64.o: functions/base64.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/base64.h
+functions/info.o: functions/info.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h php_ini.h \
+ php_globals.h functions/head.h functions/info.h build-defs.h \
+ libzend/zend_globals.h libzend/zend_ptr_stack.h \
+ libzend/zend_compile.h libzend/zend-parser.h libzend/zend_execute.h
+functions/bcmath.o: functions/bcmath.c config.h build-defs.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/number.h functions/php3_bcmath.h
+functions/number.o: functions/number.c functions/number.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h
+functions/xml.o: functions/xml.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_xml.h
+functions/unified_odbc.o: functions/unified_odbc.c config.h build-defs.h php.h \
+ php_version.h libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h dl/phpdl.h functions/php3_string.h \
+ functions/php3_unified_odbc.h functions/head.h snprintf.h
+functions/ldap.o: functions/ldap.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h
+functions/browscap.o: functions/browscap.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_browscap.h php_ini.h libzend/zend_globals.h \
+ libzend/zend_ptr_stack.h libzend/zend_compile.h libzend/zend-parser.h \
+ libzend/zend_execute.h
+functions/velocis.o: functions/velocis.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_velocis.h
+functions/gdttf.o: functions/gdttf.c config.h
+functions/gdcache.o: functions/gdcache.c config.h
+functions/zlib.o: functions/zlib.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_string.h functions/php3_zlib.h snprintf.h
+functions/COM.o: functions/COM.c
+functions/pdf.o: functions/pdf.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_pdf.h
+functions/hw.o: functions/hw.c config.h php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h
+functions/hg_comm.o: functions/hg_comm.c config.h
+functions/dlist.o: functions/dlist.c config.h
+functions/fdf.o: functions/fdf.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/head.h \
+ functions/php3_fdf.h
+functions/snmp.o: functions/snmp.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_snmp.h
+functions/var.o: functions/var.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h functions/reg.h \
+ functions/post.h functions/php3_string.h functions/php3_var.h
+functions/interbase.o: functions/interbase.c config.h php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h request_info.h php3_compat.h libzend/zend_stack.h \
+  safe_mode.h fopen-wrappers.h output.h \
+ libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/php3_interbase.h
+functions/quot_print.o: functions/quot_print.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/quot_print.h
+functions/cyr_convert.o: functions/cyr_convert.c php.h php_version.h \
+ libzend/zend.h libzend/config.h libzend/config.unix.h \
+ libzend/zend_errors.h libzend/zend_alloc.h libzend/zend_hash.h \
+ libzend/zend_llist.h libzend/zend_API.h libzend/modules.h \
+ libzend/zend_list.h config.h request_info.h php3_compat.h \
+ libzend/zend_stack.h  safe_mode.h fopen-wrappers.h \
+ output.h libzend/zend_operators.h libzend/zend_variables.h \
+ libzend/zend_constants.h functions/cyr_convert.h
+functions/sysvsem.o: functions/sysvsem.c config.h
+functions/sysvshm.o: functions/sysvshm.c config.h
+functions/dav.o: functions/dav.c php.h php_version.h libzend/zend.h \
+ libzend/config.h libzend/config.unix.h libzend/zend_errors.h \
+ libzend/zend_alloc.h libzend/zend_hash.h libzend/zend_llist.h \
+ libzend/zend_API.h libzend/modules.h libzend/zend_list.h config.h \
+ request_info.h php3_compat.h libzend/zend_stack.h  \
+ safe_mode.h fopen-wrappers.h output.h libzend/zend_operators.h \
+ libzend/zend_variables.h libzend/zend_constants.h \
+ functions/php3_dav.h
+
+# Local Variables:
+# tab-width: 4
+# End:

README.BCMATH

@@ -1,17 +0,0 @@
-How to install PHP with the BCMath arbitrary precision math library?
---------------------------------------------------------------------
-
-Due to license restrictions, the BC math library can no longer be distributed
-along with PHP.  The BC math library is distributed under the restrictive
-GNU Public License, and PHP is no longer distributed under that license, but
-under a less restrictive license, the PHP License.
-
-If you want to enable BC math support (recommended), all you have to do is
-simply download http://www.php.net/extra/number4.tar.gz, and untar it on the
-top level php4 directory.
-
-A typical way of doing this would be (assuming that you have lynx):
-cd ~/php4
-lynx -dump -source http://www.php.net/extra/number4.tar.gz | gzip -d | tar xvf -
-
-The PHP Group

README.CVS-RULES

@@ -1,105 +0,0 @@
-This is the first file you should be reading after you get your CVS account.
-We'll assume you're basically familiar with CVS, but feel free to post
-your questions on the mailing list.
-
-PHP is developed through the efforts of a large number of people.
-Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
-some basic rules with regards to CVS usage will:
-
-   a. Make everybody happier, especially those responsible for maintaining
-      the CVS itself.
-   b. Keep the changes consistently well documented and easily trackable.
-   c. Prevent some of those 'Oops' moments.
-   d. Increase the general level of good will on planet Earth.
-
-
-Having said that, here are the organizational rules:
-
-   1. Respect other people working on the project.
-
-   2. Discuss any significant changes on the list before committing. 
-
-   3. Look at EXTENSIONS file to see who is the primary maintainer of
-      the code you want to contribute to.
-
-   4. If you "strongly disagree" about something another person did, don't
-      start fighting publicly - take it up in private email.
-
-   5. If you don't know how to do something, ask first!
-
-   6. Test your changes before committing them. We mean it. Really.
-	
-
-The next few rules are more of a technical nature.
-
-   1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
-      messages every day. Woe be to those who attempt to mess with it.
-
-   2. All news updates intended for public viewing, such as new features,
-      bug fixes, improvements, etc., should go into the NEWS file. Also see
-      the note below about automatically updating NEWS in your commit message.
-
-   3. Do not commit multiple file and dump all messages in one commit. If you
-      modified several unrelated files, commit each group separately and
-      provide a nice commit message for each one. See example below.
-
-   4. Do write your commit message in such a way that it makes sense even
-      without the corresponding diff. One should be able to look at it, and
-      immediately know what was modified. Definitely include the function name
-      in the message as shown below.
-
-   5. In your commit messages, keep each line shorter than 80 characters. And
-      try to align your lines vertically, if they wrap. It looks bad otherwise.
-
-   6. If you modified a function that is callable from PHP, prepend PHP to
-      the function name as shown below.
-
-
-The format of the commit messages is pretty simple.
-
-If a line begins with #, it is taken to be a comment and will not appear
-in the ChangeLog.  If the line begins with @, it will be redirected to the
-NEWS file. Everything else goes into the ChangeLog.
-
-It is important to note that if your comment or news logline spans multiple
-lines, you have to put # or @ at the beginning of _every_ such line. Every 
-entry in NEWS has to have a name after it, so if you did it with someone's 
-help, put both your names there. Your name WILL NOT be automatically put
-at the end of the NEWS entry - so, please provide it yourself.
-
-Example. Say you modified two files, datetime.c and string.c. In datetime.c
-you added a new format option for date() function, and in string.c you fixed
-a memory leak in php_trim(). Don't commit both of these at once. Commit them
-separately and try to make sure your commit messages look something like the
-following.
-
-For datetime.c:
-
-(PHP date) Added new 'K' format modifier for printing out number of
-           days until New Year's Eve.
-@- Added new 'K' format modifier that will output the number of days
-@  until New Year's Eve. (Bob)
-
-For string.c:
-(php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
-# Man, that thing was leaking all over the place!
-@- Memory leak in trim() function has finally been fixed. (Bob)
-
-The lines above marked with @ will go into NEWS file automagically, and the
-# lines will be omitted from the ChangeLog. Alternatively, you might want
-to modify NEWS file directly and not use the @ lines.
-
-If you don't see your messages in ChangeLog and NEWS right away, don't worry!
-These files are updated once a day, so your stuff will not show up until
-somewhat later. Don't go adding stuff to NEWS by hand if you already put @
-lines in the commit message.
-
-You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
-to look at PHP CVS repository in various ways.
-
-To receive daily updates to ChangeLog and NEWS, send an empty message to
-php-cvs-daily-subscribe@lists.php.net.
-
-Happy hacking,
-
-PHP Team

README.EXT_SKEL

@@ -1,185 +0,0 @@
-
-WHAT IT IS
-
-  It's a tool for automatically creating the basic framework for a PHP module
-  and writing C code handling arguments passed to your functions from a simple
-  configuration file. See an example at the end of this file.
-
-HOW TO USE IT
-
-  Very simple. First, cd do directory ext/ in PHP 4 sources. If you just need
-  the basic framework and will be writing all the code in your functions
-  yourself, you can now do
-
-   ./ext_skel --extname=module_name
-
-  and everything you need is placed in directory module_name. In fact, if you
-  don't need to test the existence of any external header files, libraries or
-  functions in them, the module is already almost ready to be compiled in PHP.
-  Just remove 3 comments in your_module_name/config.m4, cd back up to PHP
-  sources top directory, and do
-
-    ./buildconf; ./configure --enable-module_name; make
-
-  But if you already have planned the overall scheme of your module, what
-  functions it will contain, their return types and the arguments they take
-  (a very good idea) and don't want to bother yourself with creating function
-  definitions and handling arguments passed yourself, it's time to create a
-  function definitions file, which you will give as an argument to ext_skel
-  with option
-
-    --proto=filename.
-
-FORMAT OF FUNCTION DEFINITIONS FILE
-
-  All the definitions must be on one line. In it's simplest form, it's just
-  the function name, ie.
-
-    my_function
-
-  but then you'll be left with an almost empty function body without any
-  argument handling.
-
-  Arguments are given in parenthesis after the function name, and are of
-  the form 'argument_type argument_name'. Arguments are separated from each
-  other with a comma and optional space. Argument_type can be one of int,
-  bool, double, float, string, array, object or mixed.
-
-  An optional argument is separated from the previous by an optional space,
-  then '[' and of course comma and optional space, like all the other
-  arguments. You should close a row of optional arguments with same amount of
-  ']'s as there where '['s. Currently, it does not harm if you forget to do it
-  or there is a wrong amount of ']'s, but this may change in the future.
-
-	An additional short description may be added after the parameters. 
-  If present it will be filled into the 'proto' header comments in the stubs
-  code and the <refpurpose> tag in the XML documentation.
-
-  An example:
-
-    my_function(int arg1, int arg2 [, int arg3 [, int arg4]]) this is my 1st
-
-  Arguments arg3 and arg4 are optional.
-
-  If possible, the function definition should also contain it's return type
-  in front of the definition. It's not actually used for any C code generating
-  purposes but PHP in-source documentation instead, and as such, very useful.
-  It can be any of int, double, string, bool, array, object, resource, mixed
-  or void.
-
-  The file must contain nothing else but function definitions, no comments or
-  empty lines.
-
-OTHER OPTIONS
-
-    --no-help
-
-  By default, ext_skel creates both comments in the source code and a test
-  function to help first time module writers to get started and testing
-  configuring and compiling their module. This option turns off all such things
-  which may just annoy experienced PHP module coders. Especially useful with
-
-    --stubs=file
-
-  which will leave out also all module specific stuff and write just function
-  stubs with function value declarations and passed argument handling, and
-  function entries and definitions at the end of the file, for copying and
-  pasting into an already existing module.
-
-    --assign-params
-    --string-lens
-
-  By default, function proto 'void foo(string bar)' creates the following:
-     ...
-     zval **bar;
-     ... (zend_get_parameters_ex() called in the middle...)
-     convert_to_string_ex(bar);
-
-  Specifying both of these options changes the generated code to:
-     ...
-     zval **bar_arg;
-     int bar_len;
-     char *bar = NULL;
-     ... (zend_get_parameters_ex() called in the middle...)
-     convert_to_string_ex(bar_arg);
-     bar = Z_STRVAL_PP(bar_arg);
-     bar_len = Z_STRLEN_PP(bar_arg);
-
-  You shouldn't have to ask what happens if you leave --string-lens out. If you
-  have to, it's questionable whether you should be reading this document.
-
-    --with-xml[=file]
-
-  Creates the basics for phpdoc .xml file.
-
-    --full-xml
-
-  Not implemented yet. When or if there will ever be created a framework for
-  self-contained extensions to use phpdoc system for their documentation, this
-  option enables it on the created xml file.
-
-CURRENT LIMITATIONS, BUGS AND OTHER ODDITIES
-
-  Only arguments of types int, bool, double, float, string and array are
-  handled. For other types you must write the code yourself. And for type
-  mixed, it wouldn't even be possible to write anything, because only you
-  know what to expect.
-  
-  It can't handle correctly, and probably never will, variable list of
-  of arguments. (void foo(int bar [, ...])
-
-  Don't trust too much the generated code. It tries to be useful in most of
-  the situations you might encounter, but automatic code generating will never
-  beat a programmer who knows the real situation at hand. ext_skel is generally
-  best suited for quickly generating a wrapper for c-library functions you
-  might want to have available in PHP too.
-
-  This program doesn't have a --help option. It has --no-help instead.
-
-EXAMPLE
-
-  The following _one_ line
-
-  bool my_drawtext(resource image, string text, resource font, int x, int y [, int color])
-
-  will create this function definition for you (note that there are a few
-  question marks to be replaced by you, and you must of course add your own
-  value definitions too):
-
-/* {{{ proto bool my_drawtext(resource image, string text, resource font, int x, int y[, int color])
-    */
-PHP_FUNCTION(my_drawtext)
-{
-	zval **image, **text, **font, **x, **y, **color;
-	int argc;
-	int image_id = -1;
-	int font_id = -1;
-	???LS_FETCH();
-
-	argc = ZEND_NUM_ARGS();
-	if (argc < 5 || argc > 6 || zend_get_parameters_ex(argc, &image, &text, &font, &x, &y, &color) == FAILURE) {
-		WRONG_PARAM_COUNT;
-	}
-
-	ZEND_FETCH_RESOURCE(???, ???, image, image_id, "???", ???G());
-	ZEND_FETCH_RESOURCE(???, ???, font, font_id, "???", ???G());
-
-	switch (argc) {
-		case 6:
-			convert_to_long_ex(color);
-			/* Fall-through. */
-		case 5:
-			convert_to_long_ex(y);
-			convert_to_long_ex(x);
-			/* font: fetching resources already handled. */
-			convert_to_string_ex(text);
-			/* image: fetching resources already handled. */
-			break;
-		default:
-			WRONG_PARAM_COUNT;
-	}
-
-	php_error(E_WARNING, "my_drawtext: not yet implemented");
-}
-/* }}} */
-

README.SELF-CONTAINED-EXTENSIONS

@@ -1,174 +0,0 @@
-$Id$
-=============================================================================
-
-HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
-
-  A self-contained extension can be distributed independently of
-  the PHP source. To create such an extension, three things are
-  required:
-
-  - Makefile template (Makefile.in)
-  - Configuration file (config.m4)
-  - Source code for your module
-
-  We will describe now how to create these and how to put things
-  together.
-
-PREPARING YOUR SYSTEM
-
-  While the result will run on any system, a developer's setup needs these
-  tools:
-
-    GNU autoconf
-    GNU automake
-    GNU libtool
-    GNU m4
-
-  All of these are available from 
-
-    ftp://ftp.gnu.org/pub/gnu/
-
-CONVERTING AN EXISTING EXTENSION
-
-  Just to show you how easy it is to create a self-contained
-  extension, we will convert an embedded extension into a
-  self-contained one. Install PHP and execute the following
-  commands.
-  
-     $ mkdir /tmp/newext
-     $ cd /tmp/newext
-
-  You now have an empty directory. We will copy the files from
-  the mysql extension:
-
-     $ cp -rp php-4.0.X/ext/mysql/* .
-
-  It is time to finish the module. Run:
-
-     $ phpize
-
-  You can now ship the contents of the directory - the extension
-  can live completely on its own.
-
-  The user instructions boil down to
-
-     $ ./configure \
-            [--with-php-config=/path/to/php-config] \
-            [--with-mysql=MYSQL-DIR]
-     $ make install
-
-  The MySQL module will either use the embedded MySQL client 
-  library or the MySQL installation in MYSQL-DIR.
-
-
-DEFINING THE NEW EXTENSION
-
-  Our demo extension is called "foobar".
-
-  It consists of two source files "foo.c" and "bar.c"
-  (and any arbitrary amount of header files, but that is not
-  important here).
-  
-  The demo extension does not reference any external 
-  libraries (that is important, because the user does not
-  need to specify anything).
-
-
-CREATING THE MAKEFILE TEMPLATE 
-  
-  The Makefile Template (Makefile.in) contains three lines:
-
-------------------------------------------------------------------------------
-LTLIBRARY_SHARED_NAME = foobar.la
-LTLIBRARY_SOURCES     = foo.c bar.c
-
-include $(top_srcdir)/build/dynlib.mk
-------------------------------------------------------------------------------
-
-  LTLIBRARY_SHARED_NAME specifies the name of the extension.
-  It must be of the form `ext-name.la'.
-
-  LTLIBRARY_SOURCES specifies the names of the sources files. You can
-  name an arbitrary number of source files here.
-
-  The final include directive includes the build rules (you usually
-  don't need to care about what happens there). rules.mk and other
-  files are installed by phpize which we will cover later.
-
-
-CREATING THE M4 CONFIGURATION FILE
-
-  The m4 configuration can perform additional checks. For a 
-  self-contained extension, you do not need more than a few
-  macro calls.
-
-------------------------------------------------------------------------------
-PHP_ARG_ENABLE(foobar,whether to enable foobar,
-[  --enable-foobar            Enable foobar])
-
-if test "$PHP_FOOBAR" != "no"; then
-  PHP_EXTENSION(foobar, $ext_shared)
-fi
-------------------------------------------------------------------------------
-
-  PHP_ARG_ENABLE will automatically set the correct variables, so
-  that the extension will be enabled by PHP_EXTENSION in shared mode.
-
-  Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
-  plan to distribute your module with PHP, these facilities allow you
-  to integrate your module easily into the main PHP module framework.
-
-CREATING SOURCE FILES
-
-  ext_skel can be of great help when creating the common code for all modules
-  in PHP for you and also writing basic function definitions and C code for
-  handling arguments passed to your functions. See README.EXT_SKEL for further
-  information.
-
-  As for the rest, you are currently alone here. There are a lot of existing
-  modules, use a simple module as a starting point and add your own code.
-
-
-CREATING THE SELF-CONTAINED EXTENSION
-
-  Put Makefile.in, config.m4 and the source files into one directory.
-  Then run phpize (this is installed during make install by PHP 4.0).
-  For example, if you configured PHP with --prefix=/php, you would run
-
-     $ /php/bin/phpize
-
-  This will automatically copy the necessary build files and create
-  configure from your config.m4.
-
-  And that's it. You now have a self-contained extension.
-
-INSTALLING A SELF-CONTAINED EXTENSION
-
-  An extension can be installed by running:
-
-     $ ./configure \
-            [--with-php-config=/path/to/php-config]
-     $ make install
-
-ADDING SHARED MODULE SUPPORT TO A MODULE
-
-  In order to be useful, a self-contained extension must be loadable
-  as a shared module. I will explain now how you can add shared module 
-  support to an existing module called foo.
-
-  1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
-     automatically be able to use --with-foo=shared or
-     --enable-foo=shared.
-
-  2. In config.m4, use PHP_EXTENSION(foo, $ext_shared) to enable
-     building the extension.
-
-  3. Add the following line to Makefile.in:
-
-        LTLIBRARY_SHARED_NAME = foo.la
-
-  4. Add the following lines to your C source file:
-
-        #ifdef COMPILE_DL_FOO
-        ZEND_GET_MODULE(foo)
-        #endif

README.WIN32

@@ -0,0 +1,59 @@
+Windows 95/NT Specific Notes on Compilation
+
+Windows compilation has only been tested with Microsoft Visual C++ 
+Version 5 Standard Edition.  The PHP executable has only had limited
+testing under Windows 95.  SAFE MODE and any User or Group functionality
+has not been ported/tested.
+
+-----------------------------------------------------------------------
+Compiling PHP with MSVC5
+
+There are three msvc workspaces provided with this distribution.  The one
+most people will use is php3.dsw.  This contains project files for two
+versions on PHP, one with mySQL compiled internaly, and one without (both
+have ODBC internaly compiled).  It also contains all the modules.
+
+The next workspace is php3extras.dsw.  This project contains the converter
+and a program called phpwatch, which is a simple program to watch debugger
+output under windows.  The 'socket' program is also available from the php
+site, which is a better alternative to phpwatch.
+
+The third workspace is php3sapi.dsw.  These projects are experimental and
+will probably not compile most of the time.  It contains preliminary work
+on the server api's for windows.
+
+-----------------------------------------------------------------------
+Base Configuration and Configuration Issues
+
+*The base configuration for the windows php version contains odbc
+ support.  Support for other database modules will be provided as external dll files.  
+*ODBC can be used to connect to many of the databases previously 
+supported by php (though they can still be compiled in if you have 
+the libraries!)  
+
+-----------------------------------------------------------------------
+Makefiles
+
+Be sure to edit any windows makefile and change the include directories
+to be appropriate for your system.
+
+-----------------------------------------------------------------------
+CGI Version
+
+The makefile for the cgi version of php is located in the win32 
+subdirectory of the php source tree.  This make file is specificaly
+for Visual C++ V5.
+
+-----------------------------------------------------------------------
+ISAPI/NSAPI/WSAPI/Apache Versions
+
+These versions are not yet working.  They are located in the php3sapi.dsw
+workspace.
+
+
+-----------------------------------------------------------------------
+Other Libraries
+
+See the php faq at php.net for information on where to obtain the various
+libraries needed to compile some modules.
+

README.Zeus

@@ -1,126 +0,0 @@
-Using PHP4 with the Zeus Web Server
------------------------------------
-
-Zeus fully supports running PHP in combination with our
-webserver. There are three different interfaces that can be used to
-enable PHP:
-
-* CGI
-* ISAPI
-* FastCGI
-
-Of the three, we recommend using FastCGI, which has been tested and
-benchmarked as providing the best performance and reliability.
-
-Full details of how to install PHP are available from our
-website, at:
-
-http://support.zeus.com/products/php.html
-
-If you have any problems, please check the support site for more
-up-to-date information and advice.
-
-
-Quick guide to installing FastCGI with Zeus
--------------------------------------------
-
-Step 1 - obtain and install FastCGI development kit.
-
-Grab the package from:
-http://www.fastcgi.com/dist/devkit_2.2.0.tar.gz
-
-Extract the package and follow the instructions:
-        ./configure
-        make
-        make export
-(run the last as root)
-
-This will install to /usr/local/lib/libfcgi.a
-                and  /usr/local/include/*fcgi*
-
-
-
-Step 2 - Compile PHP as FastCGI.
-
-Compile as follows:
-        ./configure --with-fastcgi
-        make
-
-Note that PHP has many options to the configure script -
-e.g. --with-mysql. You will probably want to select your usual options
-before compiling; the above is just a bare minimum, for illustration.
-
-After compilation finishes, you will be left with an executable
-program called 'php'. Copy this into your document root, under a
-dedicated FastCGI directory (e.g. $DOCROOT/fcgi-bin/php)
-
-
-Step 3 - configure Zeus
-
-Four stages:
-        -  enable FastCGI
-        -  configure FastCGI
-        -  setup alias for FastCGI
-        -  setup alias for PHP
-
-1) Using the admin server, go to the 'module configuration' page for
-your virtual server, and ensure that 'fastcgi' is enabled (select the
-tickbox to the left).
-
-2) While we can run FastCGI's locally, there are known problems with
-some OS's (specifically, the communication between web server and
-FastCGI happens over a unix domain socket, and some OS's have trouble
-sustaining high connection rates over these sockets). So instead, we
-are going to set up the PHP FastCGI to run 'remotely' over localhost
-(this uses TCP sockets, which do not suffer this problem). Go to the
-'fastcgi configuration' page, and under 'add remote fastcgi':
-        Add Remote FastCGI
-                Docroot path            /fcgi-bin/php
-                Remote machine          localhost:8002
-The first entry is where you saved PHP, above.
-The second entry is localhost:<any unused port>
-We will start the FastCGI listening on this port shortly.
-Click 'update' to commit these changes.
-
-3) Go to the path mapping module and add an alias for FastCGI:
-        Add Alias
-                Docroot path            /fcgi-bin
-                Filesystem directory    /path/to/docroot/fcgi-bin
-                Alias type              fastcgi
-Click 'update' to commit these changes
-
-4) Also on the path mapping module, add a handler for PHP:
-        Add handler
-                File extension          php
-                Handler                 /fcgi-bin/php
-Click 'update' to commit these changes
-
-Finally restart your virtual server for these changes to take effect.
-
-
-Step 4 - start PHP as a FastCGI runner
-
-When you start PHP, it will pre-fork a given number of child processes
-to handle incoming PHP requests. Each process will handle a given
-number of requests before exiting (and being replaced by a newly
-forked process). You can control these two parameters by setting the
-following environment variables BEFORE starting the FastCGI runner:
-
-PHP_FCGI_CHILDREN - the number of child processes to pre-fork. If not
-set, defaults to 8.
-
-PHP_FCGI_MAX_REQUESTS - the number of requests each PHP child process
-handles before exiting. If not set, defaults to 500.
-
-To start the FastCGI runner, execute '$ZEUSHOME/web/bin/fcgirunner
-8002 $DOCROOT/fcgi-bin/php'.  Substitute the appropriate values for
-$ZEUSHOME and $DOCROOT; also substitute for 8002 the port you chose,
-above.
-
-To stop the runner (e.g. to experiment with the above environment
-variables) you will need to manually stop and running PHP
-processes. (Use 'ps' and 'kill'). As it is PHP which is forking lots
-of children and not the runner, Zeus unfortunately cannot keep track
-of what processes are running, sorry. A typical command line may look
-like 'ps -efl | grep $DOCROOT/fcgi-bin/php | grep -v grep | awk
-'{print $4}' | xargs kill'

RELEASE_PROCESS

@@ -1,186 +0,0 @@
-	Advisory on the PHP Release Cycle
-
-
-Copyright & Liciencing
-
-  This Document is  (c)  Copyright 2000,2001 by The PHP Group 
-
-  This Document is distributed under the terms of the GNU General
-  Public License as published by the Free Software Foundation; 
-  either version 2 of the License, or (at your option) any later
-  version. 
-
-
-Table of Contents
-
-  1. Introduction
-  2. Dealing with bugs
-  2.1  As a QA Team Member
-  2.2  As a Developer
-  3. Releaseing another RC
-  4. CVS During the Release Process
-  4.1  Useful CVS Commands	  
-  5  The Final Release
-  6  Summary
-
-
-1. Introduction
-
-   This cycle should take place over roughly 10 days.  When it is
-   decided it is time for an Release to occur Andi/Zeev (Or 
-   Whoever) will tarball RC1, Tag & Branch CVS (see section 4)
-   and then announce the RC on PHP-QA and PHP-DEV.  At this 
-   point the build tracker and QA Bug System come into play.
-   If you successfully build PHP then report it in the build
-   tracker, If you then run and complete all the tests you
-   should report this too in the build tracker when
-   these features become avalible.
-
-2. Dealing with Bugs
-
-2.1 As a QA Team member
-
-   If you find a bug in an RC that you think is a showstopper
-   then, even if it is a known bug, you should report it in the
-   QA Bug system.  This marks the bug for discussion at least,
-   and preferably fixing before the actual release.  This system
-   is separate from the main bugs system so that important bugs
-   dont get lost in the midst if lots of feature/change request
-   in the approach to a release.  It is imperitive where 
-   appropraite that as a QA'er a test script, Configure options
-   and PHP.ini files are provided to enable the developer to
-   reproduce the bug, this is an important part of our job.  If
-   you have a serious bug then you should also create a test
-   script to be added to the tests dir of the php source so
-   that at the end of the process to enable us to make sure bug
-   does not return.  It is not difficult to create these test
-   scripts and a readme on it can be found in
-   php4/tests/README.
-
-
-2.2 As a Developer
-
-   What should happen is that when a bug is reported it
-   is send to php-dev and php-qa as with other bugs.  We should
-   have far stricter assignment system in this bug cycle rather
-   than just leaving them. Once again bugs should be able to be
-   marked as To Be Fixed Before release or moved to other bug
-   system. (This is currently the Release Masters responsibility)
-
-   Then before the actual release the qa bugs system can be
-   checked and if there are outstanding To Be Fixed Before
-   release bugs the Developers can see this easyly rather than
-   show stoppers being dismissed and not worried about.
-
-   When a bug is fixed the QAer who reported the bug is emailed
-   and asked to test again and see if the bug is fixed.
-
-3 Releasing another RC
-
-   If it is felt necessary that a 2nd RC is needed then it
-   should be packaged as before and announced to both lists
-   again. The testing process then starts again, the RC2 is 
-   added to the build tracker and QA'ers are asked to build and
-   retest the scripts as appropriate, espectially if you
-   reported a bug, you should test thourghly for your 
-   bug and make sure it no longer occurs. This will normally
-   add anouther 3 days to the cycle, giving QA'ers time to
-   build test and report back, then for developers to 
-   fix any problems.
-
-4 CVS during the release process
-
-   At the point where the first RC is create a branch is
-   formed. This branch is not altered form that point onward
-   other than major bug fixes. Minor non important bug 
-   fixes should not be applied to this branch but to the main
-   tree instead. Any major bug fixes should be applied to both
-   trees. The developer should test and check the RC tree then
-   also test and check the MAIN tree. This is their
-   responsibility to make sure (as far as possible) that the
-   bug fix works on both trees.
-
-4.1 Useful CVS Commands
-
-   To create a Branch <Should only be done by person tarballing
-   the RC (The Release Master)>:
-
-	$ cvs tag -b php_4_0_<Version>RC<NUMBER> 
-   IE:
-	$ cvs tag -b php_4_0_1RC1
-
-   This should be executed in the PHP directory of an up to
-   date checkout. Remember to also tag the Zend and TSRM repositories.
-
-   You can retrieve a branch in one of two ways: by checking it
-   out fresh from the repository, or by switching an existing
-   working copy over to the branch, I would suggest you
-   checkout a new copy.
-
-   To check out a new copy:
-	$ cvs checkout -r php_4_0_<Version>RC<NUMBER> php4
-   IE:
-	$ cvs checkout -r php_4_0_1RC1 php4
-
-
-   To switch a working copy (Not recomended due to possible
-   commiting to wrong branch)
-	$ cvs update -r php_4_0_<Version>RC<NUMBER> php4
-   IE:
-	$ cvs update -r php_4_0_1RC1 php4
-
-   This should be done in the PHP4 directory itself.
-
-   To revert back to normal branch you should use the
-   following:
-	$ cvs update -A
-
-   To Commit to the branch you follow exactly the same
-   procedure as normal
-	$ cvs commit file.c
-
-   MAKE SURE YOU DO NOT COMMIT TO THE WRONG BRANCH.
-
-5 The Final Release
-
-   When it is time to make the final release the following
-   proceedure should be followed. The person who is tarballing
-   the final release should check the QA bugs system and make
-   sure there are no showstoppers left unfixed. If there are
-   then bug the person the bug is assigned to until they fix
-   it. If there are no more qa bugs then they should tag the
-   branch as  php_4_0_<Version> and tarball as usual. An email
-   should be sent to PHP-GEN, PHP_DEV and PHP-QA about the new
-   release and it should be added to php.net. The windows
-   binaries and servelets should be built as soon as possible
-   and added too, as should the windows installer.
-
-6 Summary
-
-   Here is a summary of what a release cycle might look like:
-
-   Thurs: RC is agreed on and packaged, an email is sent to   
-          PHP_QA and PHP-DEV, the CVS is Branched and the     
-          Release Cycle Begins. 
-
-   Mon:   After a weekends testing most show stoppers should  
-          have been found (Hopefully) and the developers get to
-          work on fixing them.
-
-   Thurs: A second RC is released if needed with the new bug  
-          fixes in and the QAers test again.
-
-   Sun:   A review is made of all outstanding bugs and any show
-          stoppers should be fixed. if there are no show      
-          stoppers then the final release is packaged and     
-          released on the monday morning on php.net
-
-   Mon:   Release is made.
-
-
-James
---  
-James Moore
-PHP QA Team
-jmoore@php.net
-

TODO

@@ -1,143 +1,100 @@
-Things to do or at least think about doing in the future. Name in
-parenthesis means that person has taken on this project.
+$Id$
 
-Zend
-----
-    * allow foreach ($array as $k => &$val) syntax. right now we cannot 
-      traverse an array without copying each element.
-    * allow foreach ($array as $k => list($a, $b)) syntax for multi
-      dimensional arrays.
-    * look at replacing c-lib call tolower().
-    * make hash API functions work with HASH_OF() to save time.
-    * native large number support (probably with GNU GMP)
-    * Const'ify APIs. Right now, many functions leave parameters untouched,
-      but don't declare those as const. This makes interaction with other
-      interfaces difficult which pass const parameters to us. 
-    * add try..catch/throw exception handling
-    * make UNC filenames work with V_CD layer
++----
+| * -- to be done
+| ? -- to be done sometime if possible
+| P -- in progress (name should appear in parentheses after task)
+| D -- delayed until later date (specify in parentheses after task)
+| U -- done, untested
+| V -- done
++----
 
-global
-------
-    * when used in standalone (skell-script like) mode don't urldecode
-      arguments passed to php. right now it's not possible to say
-        /usr/local/bin/php somescript.php dog+cat.txt
-      as "dog+cat.txt" will arrive in php as "dog cat.txt". 
-    * make everything on the language-level independent of your locale setings.
-    * always build the standalone executable as well as the chosen SAPI 
-      target.
-    * make sure all source files have the "right" copyright.
-    * the following modules still use PHP3_TLS_*() macros (and thereby don't 
-      work in ZTS mode): ext/db/db.c, ext/gd/gd.c
-    * make sure that all ZTS globals get destructed. Most ts_allocate_id()
-      calls should have a dtor entry.
-    * activate all extensions by default that don't rely on external
-      dependices. (eg ftp)
-    * --enable-all in configure. (--enable-shared=max ...)
-    * make configure print out a summary when it's done (like XEmacs)
-    * replace standard functions which work on static data with 
-      reentrancy-safe functions (DONE?).
-    * on some platforms unimplemented function will just do nothing (e.g. symlink)
-      they should print a warning or not even be defined!
-    * implement javadoc based function docs template system.
-    * use thread-safe resolver functions (either require BIND 8 or adns).
-    * provide optional IPv6 support.
-    * make SAPI conform to CGI/1.1. Currently, all SAPI modules
-      define REMOTE_ADDR etc. themselves and reach only various level
-      of compliance.
-    * find a better way to implement script timeouts. SIGVTALRM is used
-      by some POSIX threads implementations (i.e. OpenBSD) and is not
-      available in ZTS mode.
-    * add aliases to functions to conform to new naming conventions, e.g.
-      str_to_upper().
-    * see what functions might need to be changed to use HashPosition, so
-      that the internal array pointer is not affected.
+Configuration Issues
+--------------------
+* properly detect dbm routines when they're in libc
+* add the appropriate #define magic for memmove and friends (see
+  GNU autoconf info pages for details)
+* make it possible to disable support for some extensions (gd, dbm)
+* make it possible to build selected extensions so they are
+  dynamically-loadable
 
-documentation
--------------
-    * add remarks in the documentation which functions are not implemented on win32.
-    * add remarks in the documentation which functions are not binary-safe.
-    * improve documentation for the sablotron extension
-    * update curl documentation
-    * write documentation for the bzip2 extension
-    * write documentation for the zziplib extension
+Core Language Issues
+--------------------
+* go through PHP2's php.h and see how each special #define might be
+  applied/supported in PHP3
+* move Treatdata() to language-scanner.lex where hash_environment()
+  is called including a decision about priority of variables and moving
+  Treatdata() to use hash_add() instead of hash_update() for insertions
+  to the symbol table.
+* go through FIXME and XXX lines (egrep 'FIXME|XXX' *.[ch])
+* make lexer and parser thread-safe
+* verify that binary strings are handled correctly
+V don't evaluate truth expressions more than once
+V make unset() work on arrays (tricky)
 
-ext/curl
---------
-    * Use the cURL write handler to save data for use when returning data or outputting
-      data.
-    * Have a warning scheme for when people use unsupported features.
+Core Functions
+--------------
+* go through all file functions and make sure they are opened in binary
+  mode in win32 if needed (ie copy)
+* go through all functions and look at PHP_SAFE_MODE issues
+* have a look at return codes of fsockopen() function - we should
+  probably RETURN_FALSE and then set an error code somewhere (Rasmus)
+* go through FIXME and XXX lines (egrep 'FIXME|XXX' functions/*.[ch])
+* add user-level flock() implementation to let people lock and unlock files 
+* add "'" modifier to sprintf to group thousands by comma
+* Add an improved eval() that doesn't "leak"
+? sorting of objects with a user-defined comparison function (like Perl)
+  (this shouldn't be expected before 3.1, if at all).
 
-ext/dav
---------
-    * rewrite.
 
-ext/oci8
---------
-    * all OCIFetch*() functions should return 0 for no more data and false on error.
-    * have a flag that trims trailing spaces from CHAR fields on retrieval.
-    * make allow_call_time_pass_reference=Off working.
-    * for additional todo information, see oci8.c, in ext/oci8
-
-ext/pcre
---------
-    * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
-    * add option to preg_grep() to return entries that _don't_ match
-
-ext/sablot
+Extensions
 ----------
-    * Re-write the error handling and reporting interface
-    * Cleanup the underlying code a bit
-    * Add proper support for the message handlers
+* add version strings for all extensions
+* Oracle persistent connections
+U gd support for windows
+* Illustra support (APIS)
+? CQL++ support (http://www.cql.com/)
+? GNU SQL support (does anybody actually use this?)
+? DB2 support (http://www.sleepycat.com/)
+? Shore support (http://www.cs.wisc.edu/shore/)
+? PGP Interface (use PGPlib?)
+? more Perl-like regex handling?
 
-ext/session
------------
-    * maybe implement finer-grained session variables that could be 
-      locked individually.
-    * write a network-transparent storage back-end with fallover
-      facilities
-    * provide a callback facility which is executed upon encountering
-      an unknown classname during deserialization
+Server Support
+--------------
+P ISAPI (Shane)
+  * process cookies
+  * blocking functions
+  * make sure it's Microsoft-clean so it can be used with other ISAPI
+    implementations
+* WSAPI
+* NSAPI
+  * process cookies
+  * check POST method handling code
+  * use Netscape memory allocation inside emalloc() and company
+* FastCGI support - see http://fastcgi.idle.com/
 
-ext/sockets
------------
-    * Make the extension work on windows (Daniel Beulshausen)
-    * Make the extension work with Solaris and the Sun GCC
+Win32 Specific
+--------------
+* implement some kind of syslog->file log support for win95.
+* change all file open/read/write functions from c library to win32 
+  api file functions.  The win32 api functions handle both disk files
+  and network files.  This will allow include and require to use http
+  or ftp files as the unix version does, and do away with my
+  workaround to support this.  (3.1?)
+* implement symlinks via windows shell links (shortcuts).  This will
+  work only at the script level and is not a c language level port.
 
-ext/standard
-------------
-    * add a version number to data serialized via serialize().
-    * array_add(). (Andrei)
-    * possibly modify parsing of GPC data to automatically create arrays if
-      variable name is seen more than once.
-    * implement regex-cache for url-functions.
-    * stri_replace(). (Andrei)
-    * move socket related functions to fsock.c.
-    * NOT binary safe:
-        strtok()
-        basename()
-        dirname()
-        strrpos()
-        strrchr()
-        strip_tags()
-    * rewrite win32 SMTP code to be useable for *ix to, maybe as a (default)
-      module of its own (Hartmut)
+Testing
+-------
+* truss/strace a typical PHP request and see if there are some system
+  calls that could be optimized out
+* verify that regression tests exist for all core functions
 
-ext/zziplib
-------------
-    * more fully support the zziplib api
-
-ext/wddx
---------
-    * See if we can support the remaining datatypes:
-        dateTime
-        binary
-        recordset
-
-        http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
-        (Andrei)
-
-    * implement wddx_packet_as_javascript(). (Andrei)
-
-other cool stuff
-----------------
-    * PVM extension
+Miscellaneous
+-------------
+* remove hard-coded compilation options
+? locale issues - funny things happen in PHP2 when the locale is set to
+  use , instead of . as the decimal seperator.  ie. 1.5+1.5 = 1
+? SSI->PHP3 conversion script
+? SQL-based access logging (start with examples/log-*.php3)

TSRM/LICENSE

@@ -1,26 +0,0 @@
-Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-- Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-- Neither name of the copyright holders nor the names of their contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
-IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

TSRM/Makefile.am

@@ -1,6 +0,0 @@
-## process this file with automake to produce Makefile.am
-AUTOMAKE_OPTIONS=foreign
-noinst_LTLIBRARIES=libtsrm.la
-libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
-
-depend:

TSRM/TODO

@@ -1,2 +0,0 @@
-- Improve the lock in ts_resource_ex() in order to cover less code.
-  This can probably be done by more careful hash table access

TSRM/TSRM.c

@@ -1,552 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Thread Safe Resource Manager                                         |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
-   | This source file is subject to the TSRM license, that is bundled     |
-   | with this package in the file LICENSE                                |
-   +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@zend.com>                               |
-   +----------------------------------------------------------------------+
-*/
-
-#include "TSRM.h"
-
-#ifdef ZTS
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-typedef struct _tsrm_tls_entry tsrm_tls_entry;
-
-struct _tsrm_tls_entry {
-	void **storage;
-	int count;
-	THREAD_T thread_id;
-	tsrm_tls_entry *next;
-};
-
-
-typedef struct {
-	size_t size;
-	ts_allocate_ctor ctor;
-	ts_allocate_dtor dtor;
-} tsrm_resource_type;
-
-
-#define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)
-#define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)-1)
-
-/* The memory manager table */
-static tsrm_tls_entry	**tsrm_tls_table=NULL;
-static int				tsrm_tls_table_size;
-static ts_rsrc_id		id_count;
-
-/* The resource sizes table */
-static tsrm_resource_type	*resource_types_table=NULL;
-static int					resource_types_table_size;
-
-
-static MUTEX_T tsmm_mutex;	/* thread-safe memory manager mutex */
-
-/* New thread handlers */
-static void (*tsrm_new_thread_begin_handler)();
-static void (*tsrm_new_thread_end_handler)();
-
-/* Debug support */
-int tsrm_error(int level, const char *format, ...);
-
-/* Read a resource from a thread's resource storage */
-void *ts_resource_read( tsrm_tls_entry *thread_resources, ts_rsrc_id id );
-static int tsrm_error_level;
-static FILE *tsrm_error_file;
-#if TSRM_DEBUG
-#define TSRM_ERROR tsrm_error
-#define TSRM_SAFE_ARRAY_OFFSET(array, offset, range)	(((offset)>=0 && (offset)<(range)) ? array[offset] : NULL)
-#else
-#define TSRM_ERROR
-#define TSRM_SAFE_ARRAY_OFFSET(array, offset, range)	array[offset]
-#endif
-
-#if defined(PTHREADS)
-/* Thread local storage */
-static pthread_key_t tls_key;
-#endif
-
-
-/* Startup TSRM (call once for the entire process) */
-TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
-{
-#if defined(GNUPTH)
-	pth_init();
-#elif defined(PTHREADS)
-	pthread_key_create( &tls_key, 0 );
-#endif
-
-	tsrm_error_file = stderr;
-	tsrm_error_set(debug_level, debug_filename);
-	tsrm_tls_table_size = expected_threads;
-
-	tsrm_tls_table = (tsrm_tls_entry **) calloc(tsrm_tls_table_size, sizeof(tsrm_tls_entry *));
-	if (!tsrm_tls_table) {
-		TSRM_ERROR(TSRM_ERROR_LEVEL_ERROR, "Unable to allocate TLS table");
-		return 0;
-	}
-	id_count=0;
-
-	resource_types_table_size = expected_resources;
-	resource_types_table = (tsrm_resource_type *) calloc(resource_types_table_size, sizeof(tsrm_resource_type));
-	if (!resource_types_table) {
-		TSRM_ERROR(TSRM_ERROR_LEVEL_ERROR, "Unable to allocate resource types table");
-		free(tsrm_tls_table);
-		tsrm_tls_table = NULL;
-		return 0;
-	}
-
-	tsmm_mutex = tsrm_mutex_alloc();
-
-	tsrm_new_thread_begin_handler = tsrm_new_thread_end_handler = NULL;
-
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Started up TSRM, %d expected threads, %d expected resources", expected_threads, expected_resources);
-	return 1;
-}
-
-
-/* Shutdown TSRM (call once for the entire process) */
-TSRM_API void tsrm_shutdown(void)
-{
-	int i;
-
-	if (tsrm_tls_table) {
-		for (i=0; i<tsrm_tls_table_size; i++) {
-			tsrm_tls_entry *p = tsrm_tls_table[i], *next_p;
-
-			while (p) {
-				int j;
-
-				next_p = p->next;
-				for (j=0; j<id_count; j++) {
-					free(p->storage[j]);
-				}
-				free(p->storage);
-				free(p);
-				p = next_p;
-			}
-		}
-		free(tsrm_tls_table);
-		tsrm_tls_table = NULL;
-	}
-	if (resource_types_table) {
-		free(resource_types_table);
-		resource_types_table=NULL;
-	}
-	tsrm_mutex_free(tsmm_mutex);
-	tsmm_mutex = NULL;
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Shutdown TSRM");
-	if (tsrm_error_file!=stderr) {
-		fclose(tsrm_error_file);
-	}
-#if defined(GNUPTH)
-	pth_kill();
-#elif defined(PTHREADS)
-        pthread_key_delete( tls_key );
-#endif
-}
-
-
-/* allocates a new thread-safe-resource id */
-TSRM_API ts_rsrc_id ts_allocate_id(size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor)
-{
-	ts_rsrc_id new_id;
-	int i;
-
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Obtaining a new resource id, %d bytes", size);
-
-	tsrm_mutex_lock(tsmm_mutex);
-
-	/* obtain a resource id */
-	new_id = id_count++;
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Obtained resource id %d", TSRM_SHUFFLE_RSRC_ID(new_id));
-
-	/* store the new resource type in the resource sizes table */
-	if (resource_types_table_size < id_count) {
-		resource_types_table = (tsrm_resource_type *) realloc(resource_types_table, sizeof(tsrm_resource_type)*id_count);
-		if (!resource_types_table) {
-			tsrm_mutex_unlock(tsmm_mutex);
-			TSRM_ERROR(TSRM_ERROR_LEVEL_ERROR, "Unable to allocate storage for resource");
-			return 0;
-		}
-		resource_types_table_size = id_count;
-	}
-	resource_types_table[new_id].size = size;
-	resource_types_table[new_id].ctor = ctor;
-	resource_types_table[new_id].dtor = dtor;
-
-	/* enlarge the arrays for the already active threads */
-	for (i=0; i<tsrm_tls_table_size; i++) {
-		tsrm_tls_entry *p = tsrm_tls_table[i];
-
-		while (p) {
-			if (p->count < id_count) {
-				int j;
-
-				p->storage = (void *) realloc(p->storage, sizeof(void *)*id_count);
-				for (j=p->count; j<id_count; j++) {
-					p->storage[j] = (void *) malloc(resource_types_table[j].size);
-					if (resource_types_table[j].ctor) {
-						resource_types_table[j].ctor(p->storage[j]);
-					}
-				}
-				p->count = id_count;
-			}
-			p = p->next;
-		}
-	}
-	tsrm_mutex_unlock(tsmm_mutex);
-
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Successfully allocated new resource id %d", TSRM_SHUFFLE_RSRC_ID(new_id));
-	return TSRM_SHUFFLE_RSRC_ID(new_id);
-}
-
-
-static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
-{
-	int i;
-
-	TSRM_ERROR(TSRM_ERROR_LEVEL_CORE, "Creating data structures for thread %x", thread_id);
-	(*thread_resources_ptr) = (tsrm_tls_entry *) malloc(sizeof(tsrm_tls_entry));
-	(*thread_resources_ptr)->storage = (void **) malloc(sizeof(void *)*id_count);
-	(*thread_resources_ptr)->count = id_count;
-	(*thread_resources_ptr)->thread_id = thread_id;
-	(*thread_resources_ptr)->next = NULL;
-
-#if defined(PTHREADS)
-        /* Set thread local storage to this new thread resources structure */
-        pthread_setspecific( tls_key, (void *)*thread_resources_ptr );
-#endif
-
-	if (tsrm_new_thread_begin_handler) {
-		tsrm_new_thread_begin_handler(thread_id);
-	}
-	for (i=0; i<id_count; i++) {
-		(*thread_resources_ptr)->storage[i] = (void *) malloc(resource_types_table[i].size);
-		if (resource_types_table[i].ctor) {
-			resource_types_table[i].ctor((*thread_resources_ptr)->storage[i]);
-		}
-	}
-
-	tsrm_mutex_unlock(tsmm_mutex);
-
-	if (tsrm_new_thread_end_handler) {
-		tsrm_new_thread_end_handler(thread_id);
-	}
-}
-
-
-/* fetches the requested resource for the current thread */
-TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
-{
-	THREAD_T thread_id;
-	int hash_value;
-	tsrm_tls_entry *thread_resources;
-
-        if( !th_id ) {
-#if defined(PTHREADS)
-                /* Fast path for looking up the resources for the current
-                 * thread. Its used by just about every call to
-                 * ts_resource_ex(). This avoids the need for a mutex lock
-                 * and our hashtable lookup.
-                 */
-                thread_resources = pthread_getspecific( tls_key );
-                if( thread_resources ) {
-                        TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for current thread %d", id, (long) thread_resources->thread_id );
-                        return ts_resource_read( thread_resources, id );
-                }
-#endif
-		thread_id = tsrm_thread_id();
-	} else {
-		thread_id = *th_id;
-        }
-
-	TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Fetching resource id %d for thread %ld", id, (long) thread_id);
-	tsrm_mutex_lock(tsmm_mutex);
-
-	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
-	thread_resources = tsrm_tls_table[hash_value];
-
-	if (!thread_resources) {
-		allocate_new_resource(&tsrm_tls_table[hash_value], thread_id);
-		return ts_resource_ex(id, &thread_id);
-	} else {
-		 do {
-			if (thread_resources->thread_id == thread_id) {
-				break;
-			}
-			if (thread_resources->next) {
-				thread_resources = thread_resources->next;
-			} else {
-				allocate_new_resource(&thread_resources->next, thread_id);
-				return ts_resource_ex(id, &thread_id);
-				/*
-				 * thread_resources = thread_resources->next;
-				 * break;
-				 */
-			}
-		 } while (thread_resources);
-	}
-	tsrm_mutex_unlock(tsmm_mutex);
-        return ts_resource_read( thread_resources, id );
-}
-
-
-/* Read a specific resource from the thread's resources.
- * This is called outside of a mutex, so have to be aware about external
- * changes to the structure as we read it.
- */
-void *ts_resource_read( tsrm_tls_entry *thread_resources, ts_rsrc_id id )
-{
-	void *resource;
-
-	resource = TSRM_SAFE_ARRAY_OFFSET(thread_resources->storage, TSRM_UNSHUFFLE_RSRC_ID(id), thread_resources->count);
-	if (resource) {
-		TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Successfully fetched resource id %d for thread id %ld - %x", id, (long) thread_resources->thread_id, (long) resource);
-	} else {
-		TSRM_ERROR(TSRM_ERROR_LEVEL_ERROR, "Resource id %d is out of range (%d..%d)", id, TSRM_SHUFFLE_RSRC_ID(0), TSRM_SHUFFLE_RSRC_ID(thread_resources->count-1));
-                abort();
-	}
-	return resource;
-}
-
-
-/* frees all resources allocated for the current thread */
-void ts_free_thread(void)
-{
-	tsrm_tls_entry *thread_resources;
-        int i;
-	THREAD_T thread_id = tsrm_thread_id();
-	int hash_value;
-	tsrm_tls_entry *last=NULL;
-
-	tsrm_mutex_lock(tsmm_mutex);
-	hash_value = THREAD_HASH_OF(thread_id, tsrm_tls_table_size);
-	thread_resources = tsrm_tls_table[hash_value];
-
-	while (thread_resources) {
-		if (thread_resources->thread_id == thread_id) {
-                        tsrm_mutex_unlock(tsmm_mutex);
-
-			for (i=0; i<thread_resources->count; i++) {
-				if (resource_types_table[i].dtor) {
-					resource_types_table[i].dtor(thread_resources->storage[i]);
-                                }
-                        }
-			for (i=0; i<thread_resources->count; i++) {
-				free(thread_resources->storage[i]);
-			}
-                        tsrm_mutex_lock(tsmm_mutex);
-			free(thread_resources->storage);
-			if (last) {
-				last->next = thread_resources->next;
-			} else {
-				tsrm_tls_table[hash_value]=NULL;
-			}
-#if defined(PTHREADS)
-                        pthread_setspecific( tls_key, 0 );
-#endif                        
-			free(thread_resources);
-			break;
-		}
-		if (thread_resources->next) {
-			last = thread_resources;
-		}
-		thread_resources = thread_resources->next;
-	}
-	tsrm_mutex_unlock(tsmm_mutex);
-}
-
-
-/* deallocates all occurrences of a given id */
-void ts_free_id(ts_rsrc_id id)
-{
-}
-
-
-
-
-/*
- * Utility Functions
- */
-
-/* Obtain the current thread id */
-TSRM_API THREAD_T tsrm_thread_id(void)
-{
-#ifdef TSRM_WIN32
-	return GetCurrentThreadId();
-#elif defined(GNUPTH)
-	return pth_self();
-#elif defined(PTHREADS)
-	return pthread_self();
-#elif defined(NSAPI)
-	return systhread_current();
-#elif defined(PI3WEB)
-	return PIThread_getCurrent();
-#endif
-}
-
-
-/* Allocate a mutex */
-TSRM_API MUTEX_T tsrm_mutex_alloc(void)
-{
-    MUTEX_T mutexp;
-
-#ifdef TSRM_WIN32
-    mutexp = malloc(sizeof(CRITICAL_SECTION));
-	InitializeCriticalSection(mutexp);
-#elif defined(GNUPTH)
-	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
-	pth_mutex_init(mutexp);
-#elif defined(PTHREADS)
-	mutexp = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init(mutexp,NULL);
-#elif defined(NSAPI)
-	mutexp = crit_init();
-#elif defined(PI3WEB)
-	mutexp = PIPlatform_allocLocalMutex();
-#endif
-#ifdef THR_DEBUG
-		printf("Mutex created thread: %d\n",mythreadid());
-#endif
-    return( mutexp );
-}
-
-
-/* Free a mutex */
-TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
-{
-    if (mutexp) {
-#ifdef TSRM_WIN32
-		DeleteCriticalSection(mutexp);
-#elif defined(GNUPTH)
-		free(mutexp);
-#elif defined(PTHREADS)
-		pthread_mutex_destroy(mutexp);
-		free(mutexp);
-#elif defined(NSAPI)
-		crit_terminate(mutexp);
-#elif defined(PI3WEB)
-		PISync_delete(mutexp) 
-#endif
-    }
-#ifdef THR_DEBUG
-		printf("Mutex freed thread: %d\n",mythreadid());
-#endif
-}
-
-
-/* Lock a mutex */
-TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
-{
-	TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Mutex locked thread: %ld", tsrm_thread_id());
-#ifdef TSRM_WIN32
-	EnterCriticalSection(mutexp);
-	return 1;
-#elif defined(GNUPTH)
-	return pth_mutex_acquire(mutexp, 0, NULL);
-#elif defined(PTHREADS)
-	return pthread_mutex_lock(mutexp);
-#elif defined(NSAPI)
-	return crit_enter(mutexp);
-#elif defined(PI3WEB)
-	return PISync_lock(mutexp);
-#endif
-}
-
-
-/* Unlock a mutex */
-TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
-{
-	TSRM_ERROR(TSRM_ERROR_LEVEL_INFO, "Mutex unlocked thread: %ld", tsrm_thread_id());
-#ifdef TSRM_WIN32
-	LeaveCriticalSection(mutexp);
-	return 1;
-#elif defined(GNUPTH)
-	return pth_mutex_release(mutexp);
-#elif defined(PTHREADS)
-	return pthread_mutex_unlock(mutexp);
-#elif defined(NSAPI)
-	return crit_exit(mutexp);
-#elif defined(PI3WEB)
-	return PISync_unlock(mutexp);
-#endif
-}
-
-
-TSRM_API void *tsrm_set_new_thread_begin_handler(void (*new_thread_begin_handler)(THREAD_T thread_id))
-{
-	void *retval = (void *) tsrm_new_thread_begin_handler;
-
-	tsrm_new_thread_begin_handler = new_thread_begin_handler;
-	return retval;
-}
-
-
-TSRM_API void *tsrm_set_new_thread_end_handler(void (*new_thread_end_handler)(THREAD_T thread_id))
-{
-	void *retval = (void *) tsrm_new_thread_end_handler;
-
-	tsrm_new_thread_end_handler = new_thread_end_handler;
-	return retval;
-}
-
-
-
-/*
- * Debug support
- */
-
-#if TSRM_DEBUG
-int tsrm_error(int level, const char *format, ...)
-{
-	if (level<=tsrm_error_level) {
-		va_list args;
-		int size;
-
-		fprintf(tsrm_error_file, "TSRM:  ");
-		va_start(args, format);
-		size = vfprintf(tsrm_error_file, format, args);
-		va_end(args);
-		fprintf(tsrm_error_file, "\n");
-		fflush(tsrm_error_file);
-		return size;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-
-void tsrm_error_set(int level, char *debug_filename)
-{
-	tsrm_error_level = level;
-
-#if TSRM_DEBUG
-	if (tsrm_error_file!=stderr) { /* close files opened earlier */
-		fclose(tsrm_error_file);
-	}
-
-	if (debug_filename) {
-		tsrm_error_file = fopen(debug_filename, "w");
-		if (!tsrm_error_file) {
-			tsrm_error_file = stderr;
-		}
-	} else {
-		tsrm_error_file = stderr;
-	}
-#endif
-}
-
-#endif /* ZTS */

TSRM/TSRM.dsp

@@ -1,174 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TSRM" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=TSRM - Win32 Debug_TS
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "TSRM.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "TSRM.mak" CFG="TSRM - Win32 Debug_TS"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "TSRM - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "TSRM - Win32 Release_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "TSRM - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE "TSRM - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "TSRM - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "TSRM___Win32_Debug_TS"
-# PROP BASE Intermediate_Dir "TSRM___Win32_Debug_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "C:\Projects\TSRM" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_DEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=1 /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40d /d "_DEBUG"
-# ADD RSC /l 0x40d /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "TSRM___Win32_Release_TS"
-# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TS_inline"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "TSRM___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TS_inline"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TS_inline"
-# PROP Intermediate_Dir "Release_TS_inline"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "TSRM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "TSRM - Win32 Release_TSDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "TSRM___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "TSRM___Win32_Release_TSDbg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TSDbg"
-# PROP Intermediate_Dir "Release_TSDbg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDEBUG" /D "ZTS" /D "_LIB" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D TSRM_DEBUG=0 /YX /FD /c
-# ADD BASE RSC /l 0x40d /d "NDEBUG"
-# ADD RSC /l 0x40d /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "TSRM - Win32 Debug_TS"
-# Name "TSRM - Win32 Release_TS"
-# Name "TSRM - Win32 Release_TS_inline"
-# Name "TSRM - Win32 Release_TSDbg"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\TSRM.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_strtok_r.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_virtual_cwd.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\TSRM.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_config.w32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_config_common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_strtok_r.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tsrm_virtual_cwd.h
-# End Source File
-# End Group
-# End Target
-# End Project

TSRM/TSRM.h

@@ -1,116 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Thread Safe Resource Manager                                         |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1999, 2000, Andi Gutmans, Sascha Schumann, Zeev Suraski|
-   | This source file is subject to the TSRM license, that is bundled     |
-   | with this package in the file LICENSE                                |
-   +----------------------------------------------------------------------+
-   | Authors:  Zeev Suraski <zeev@zend.com>                               |
-   +----------------------------------------------------------------------+
-*/
-
-#ifndef TSRM_H
-#define TSRM_H
-
-#ifdef HAVE_CONFIG_H
-# include "tsrm_config.h"
-#endif
-
-/* Only compile multi-threading functions if we're in ZTS mode */
-#ifdef ZTS
-
-#ifdef WIN32
-# define TSRM_WIN32
-#endif
-
-#ifdef TSRM_WIN32
-# include <windows.h>
-#elif defined(GNUPTH)
-# include <pth.h>
-#elif defined(PTHREADS)
-# include <pthread.h>
-#endif
-
-typedef int ts_rsrc_id;
-
-#ifdef TSRM_WIN32
-#	ifdef TSRM_EXPORTS
-#	define TSRM_API __declspec(dllexport)
-#	else
-#	define TSRM_API __declspec(dllimport)
-#	endif
-#else
-#	define TSRM_API
-#endif
-
-
-/* Define THREAD_T and MUTEX_T */
-#ifdef TSRM_WIN32
-# define THREAD_T DWORD
-# define MUTEX_T CRITICAL_SECTION *
-#elif defined(GNUPTH)
-# define THREAD_T pth_t
-# define MUTEX_T pth_mutex_t *
-#elif defined(PTHREADS)
-# define THREAD_T pthread_t
-# define MUTEX_T pthread_mutex_t *
-#elif defined(NSAPI)
-# define THREAD_T SYS_THREAD
-# define MUTEX_T CRITICAL
-#elif defined(PI3WEB)
-# define THREAD_T PIThread *
-# define MUTEX_T PISync *
-#endif
-
-typedef void (*ts_allocate_ctor)(void *);
-typedef void (*ts_allocate_dtor)(void *);
-
-#define THREAD_HASH_OF(thr,ts)  (unsigned long)thr%(unsigned long)ts
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* startup/shutdown */
-TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename);
-TSRM_API void tsrm_shutdown(void);
-
-/* allocates a new thread-safe-resource id */
-TSRM_API ts_rsrc_id ts_allocate_id(size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor);
-
-/* fetches the requested resource for the current thread */
-TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id);
-#define ts_resource(id)			ts_resource_ex(id, NULL)
-
-/* frees all resources allocated for the current thread */
-TSRM_API void ts_free_thread(void);
-
-/* deallocates all occurrences of a given id */
-TSRM_API void ts_free_id(ts_rsrc_id id);
-
-
-/* Debug support */
-#define TSRM_ERROR_LEVEL_ERROR	1
-#define TSRM_ERROR_LEVEL_CORE	2
-#define TSRM_ERROR_LEVEL_INFO	3
-TSRM_API int tsrm_error(int level, const char *format, ...);
-TSRM_API void tsrm_error_set(int level, char *debug_filename);
-
-/* utility functions */
-TSRM_API THREAD_T tsrm_thread_id(void);
-TSRM_API MUTEX_T tsrm_mutex_alloc(void);
-TSRM_API void tsrm_mutex_free(MUTEX_T mutexp);
-TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp);
-TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp);
-
-TSRM_API void *tsrm_set_new_thread_begin_handler(void (*new_thread_begin_handler)(THREAD_T thread_id));
-TSRM_API void *tsrm_set_new_thread_end_handler(void (*new_thread_end_handler)(THREAD_T thread_id));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZTS */
-
-#endif /* TSRM_H */

TSRM/acconfig.h

@@ -1 +0,0 @@
-#undef PTHREADS

TSRM/acinclude.m4

@@ -1,5 +0,0 @@
-
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
-  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
-])
-

TSRM/build.mk

@@ -1,43 +0,0 @@
-# Makefile to generate build tools
-#
-# Standard usage:
-#        make -f build.mk
-#
-# Written by Sascha Schumann
-#
-# $Id$ 
-
-
-LT_TARGETS = ltmain.sh ltconfig
-
-config_h_in = tsrm_config.h.in
-
-makefile_am_files = Makefile.am
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files    = $(makefile_am_files:e.am=e)
-
-targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
-
-all: $(targets)
-
-clean:
-	rm -f $(targets)
-
-$(LT_TARGETS):
-	rm -f $(LT_TARGETS)
-	libtoolize --automake $(AMFLAGS) -f
-
-$(makefile_in_files): $(makefile_am_files)
-	automake -a -i $(AMFLAGS) $(makefile_files)
-
-aclocal.m4: configure.in acinclude.m4
-	aclocal
-
-$(config_h_in): configure.in acconfig.h
-# explicitly remove target since autoheader does not seem to work 
-# correctly otherwise (timestamps are not updated)
-	@rm -f $@
-	autoheader
-
-configure: aclocal.m4 configure.in
-	autoconf

TSRM/buildconf

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-case "$1" in
---copy)
-	automake_flags=--copy
-	shift
-;;
-esac
-
-libtoolize --force --automake $automake_flags
-
-mv aclocal.m4 aclocal.m4.old 2>/dev/null
-aclocal
-if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}aclocal.m4"
-    mv aclocal.m4.old aclocal.m4
-else
-    echo "buildconf: created or modified ${1}aclocal.m4"
-fi
-
-autoheader
-
-automake --add-missing --include-deps $automake_flags
-
-mv configure configure.old 2>/dev/null
-autoconf
-if cmp configure.old configure > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}configure"
-    mv configure.old configure
-else
-    echo "buildconf: created or modified ${1}configure"
-fi
-

TSRM/configure.in

@@ -1,33 +0,0 @@
-dnl $Id$
-dnl
-dnl Minimalistic configure.in for TSRM.
-dnl
-
-AC_INIT(TSRM.c)
-AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
-AM_CONFIG_HEADER(tsrm_config.h)
-
-sinclude(tsrm.m4)
-	
-TSRM_BASIC_CHECKS
-TSRM_THREADS_CHECKS
-	
-AM_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
-  AM_SET_LIBTOOL_VARIABLE([--silent])
-fi
-
-dnl TSRM_PTHREAD
-
-AC_CHECK_HEADERS(
-utime.h \
-dirent.h \
-stdarg.h \
-alloca.h \
-unistd.h \
-limits.h
-)
-
-AC_DEFINE(ZTS,1,[ ])
-
-AC_OUTPUT(Makefile)

TSRM/readdir.h

@@ -1,44 +0,0 @@
-#ifndef READDIR_H
-#define READDIR_H
-
-
-/*
- * Structures and types used to implement opendir/readdir/closedir
- * on Windows 95/NT.
- */
-
-#include <io.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-
-/* struct dirent - same as Unix */
-
-struct dirent {
-	long d_ino;					/* inode (always 1 in WIN32) */
-	off_t d_off;				/* offset to this dirent */
-	unsigned short d_reclen;	/* length of d_name */
-	char d_name[_MAX_FNAME + 1];	/* filename (null terminated) */
-};
-
-
-/* typedef DIR - not the same as Unix */
-typedef struct {
-	long handle;				/* _findfirst/_findnext handle */
-	short offset;				/* offset into directory */
-	short finished;				/* 1 if there are not more files */
-	struct _finddata_t fileinfo;	/* from _findfirst/_findnext */
-	char *dir;					/* the dir we are reading */
-	struct dirent dent;			/* the dirent to return */
-} DIR;
-
-/* Function prototypes */
-DIR *opendir(const char *);
-struct dirent *readdir(DIR *);
-int readdir_r(DIR *, struct dirent *, struct dirent **);
-int closedir(DIR *);
-void rewinddir(DIR *);
-
-
-#endif /* READDIR_H */

TSRM/threads.m4

@@ -1,157 +0,0 @@
-dnl  Copyright (c) 1999, 2000 Sascha Schumann. All rights reserved.
-dnl 
-dnl  Redistribution and use in source and binary forms, with or without
-dnl  modification, are permitted provided that the following conditions
-dnl  are met:
-dnl 
-dnl  1. Redistributions of source code must retain the above copyright
-dnl     notice, this list of conditions and the following disclaimer.
-dnl 
-dnl  2. Redistributions in binary form must reproduce the above copyright
-dnl     notice, this list of conditions and the following disclaimer in
-dnl     the documentation and/or other materials provided with the
-dnl     distribution.
-dnl 
-dnl  THIS SOFTWARE IS PROVIDED BY SASCHA SCHUMANN ``AS IS'' AND ANY
-dnl  EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-dnl  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-dnl  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SASCHA SCHUMANN OR
-dnl  HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-dnl  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-dnl  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-dnl  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-dnl  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-dnl  OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dnl
-dnl PTHREADS_FLAGS
-dnl
-dnl Set some magic defines to achieve POSIX threads conformance
-dnl
-AC_DEFUN(PTHREADS_FLAGS,[
-  if test -z "$host_alias"; then
-    AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
-  fi
-  case "$host_alias" in
-  *solaris*)
-    PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
-  *freebsd*)
-    PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
-  *linux*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
-  *aix*)
-    PTHREAD_FLAGS="-D_THREAD_SAFE";;
-  *irix*)
-    PTHREAD_FLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS";;
-  *hpux*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
-  *sco*)
-    PTHREAD_FLAGS="-D_REENTRANT";;
-dnl Solves sigwait() problem, creates problems with u_long etc.
-dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
-  esac
-
-  if test -n "$PTHREAD_FLAGS"; then
-    CPPFLAGS="$CPPFLAGS $PTHREAD_FLAGS"
-  fi
-])dnl
-dnl
-dnl PTHREADS_CHECK_COMPILE
-dnl
-dnl Check whether the current setup can use POSIX threads calls
-dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
-AC_TRY_RUN( [
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-} ], [ 
-  pthreads_working="yes"
-  ], [
-  pthreads_working="no"
-  ], pthreads_working="no" ) ] )dnl
-dnl
-dnl PTHREADS_CHECK()
-dnl
-dnl Try to find a way to enable POSIX threads
-dnl
-dnl  Magic flags
-dnl  -kthread          gcc (FreeBSD)
-dnl  -Kthread          UDK cc (UnixWare)
-dnl  -mt               WorkShop cc (Solaris)
-dnl  -mthreads         gcc (AIX)
-dnl  -pthread          gcc (Linux, FreeBSD, NetBSD, OpenBSD)
-dnl  -pthreads         gcc (Solaris) 
-dnl  -qthreaded        AIX cc V5
-dnl  -threads          gcc (HP-UX)
-dnl
-AC_DEFUN(PTHREADS_CHECK,[
-
-save_CFLAGS="$CFLAGS"
-save_LIBS="$LIBS"
-PTHREADS_ASSIGN_VARS
-PTHREADS_CHECK_COMPILE
-LIBS="$save_LIBS"
-CFLAGS="$save_CFLAGS"
-
-AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
-ac_cv_pthreads_cflags=""
-if test "$pthreads_working" != "yes"; then
-  for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
-    ac_save="$CFLAGS"
-    CFLAGS="$CFLAGS $flag"
-    PTHREADS_CHECK_COMPILE
-    CFLAGS="$ac_save"
-    if test "$pthreads_working" = "yes"; then
-      ac_cv_pthreads_cflags="$flag"
-      break
-    fi
-  done
-fi
-])
-
-AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-ac_cv_pthreads_lib=""
-if test "$pthreads_working" != "yes"; then
-  for lib in pthread pthreads c_r; do
-    ac_save="$LIBS"
-    LIBS="$LIBS -l$lib"
-    PTHREADS_CHECK_COMPILE
-    LIBS="$ac_save"
-    if test "$pthreads_working" = "yes"; then
-      ac_cv_pthreads_lib="$lib"
-      break
-    fi
-  done
-fi
-])
-
-if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX Threads found"
-else
-  threads_result="POSIX Threads not found"
-fi
-])dnl
-dnl
-dnl
-AC_DEFUN(PTHREADS_ASSIGN_VARS,[
-if test -n "$ac_cv_pthreads_lib"; then
-  LIBS="$LIBS -l$ac_cv_pthreads_lib"
-fi
-
-if test -n "$ac_cv_pthreads_cflags"; then
-  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
-fi
-])dnl

TSRM/tsrm.m4

@@ -1,98 +0,0 @@
-
-dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
-AC_DEFUN(TSRM_CHECK_GCC_ARG,[
-  gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
-  AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
-  echo 'void somefunc() { };' > conftest.c
-  cmd='$CC $1 -c conftest.c'
-  if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
-    ac_result=no
-  else
-    ac_result=yes
-  fi
-  eval $gcc_arg_name=$ac_result
-  rm -f conftest.*
-  ])
-  if eval test "\$$gcc_arg_name" = "yes"; then
-    $2
-  else
-    :
-    $3
-  fi
-])
-
-AC_DEFUN(TSRM_BASIC_CHECKS,[
-
-AC_REQUIRE([AC_PROG_CC])dnl
-dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
-AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-
-AC_CHECK_HEADERS(stdarg.h)
-
-])
-
-
-AC_DEFUN(TSRM_CHECK_PTH,[
-
-AC_MSG_CHECKING(for GNU Pth)
-PTH_PREFIX="`$1 --prefix`"
-if test -z "$PTH_PREFIX"; then
-  AC_MSG_RESULT(Please check your Pth installation)
-fi
-
-CPPFLAGS="$CPPFLAGS `$1 --cflags`"
-LDFLAGS="$LDFLAGS `$1 --ldflags`"
-LIBS="$LIBS `$1 --libs`"
-
-AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth])
-AC_MSG_RESULT(yes - installed in $PTH_PREFIX)
-
-])
-
-sinclude(threads.m4)
-sinclude(TSRM/threads.m4)
-
-AC_DEFUN(TSRM_CHECK_PTHREADS,[
-		
-PTHREADS_CHECK
-		
-if test "$pthreads_working" != "yes"; then
-  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
-fi
-		
-AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
-
-AC_MSG_CHECKING(for POSIX threads)
-AC_MSG_RESULT(yes)
-])
-
-
-AC_DEFUN(TSRM_THREADS_CHECKS,[
-
-dnl For the thread implementations, we always use --with-*
-dnl to maintain consistency
-
-AC_ARG_WITH(tsrm-pth,
-[  --with-tsrm-pth[=pth-config]    Use GNU Pth.],[
-  TSRM_PTH=$withval
-],[
-  TSRM_PTH=no
-])
-
-AC_ARG_WITH(tsrm-pthreads,
-[  --with-tsrm-pthreads    Use POSIX threads (default)],[
-  TSRM_PTHREADS=$withval
-],[
-  TSRM_PTHREADS=yes
-])
-
-test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
-
-if test "$TSRM_PTH" != "no"; then
-  TSRM_CHECK_PTH($TSRM_PTH)
-elif test "$TSRM_PTHREADS" != "no"; then
-  TSRM_CHECK_PTHREADS
-fi
-
-])

TSRM/tsrm_config.w32.h

@@ -1,15 +0,0 @@
-#ifndef TSRM_CONFIG_W32_H
-#define TSRM_CONFIG_W32_H
-
-#define HAVE_UTIME 1
-#define HAVE_ALLOCA 1
-
-#undef inline
-#ifdef ZEND_WIN32_FORCE_INLINE
-# define inline __forceinline
-#else
-# define inline
-#endif
-
-
-#endif

TSRM/tsrm_config_common.h

@@ -1,47 +0,0 @@
-#ifndef TSRM_CONFIG_COMMON_H
-#define TSRM_CONFIG_COMMON_H
-
-#if WINNT|WIN32
-# define TSRM_WIN32
-#endif
-
-#ifndef TSRM_WIN32
-# include "tsrm_config.h"
-# include <sys/param.h>
-#else
-# include "tsrm_config.w32.h"
-#endif
-
-#ifdef TSRM_WIN32
-#include <malloc.h>
-#endif
-
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-#ifndef MAXPATHLEN
-# ifdef PATH_MAX
-#  define MAXPATHLEN PATH_MAX
-# else
-#  define MAXPATHLEN 256
-# endif
-#endif
-
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2))
-# define tsrm_do_alloca(p) alloca(p)
-# define tsrm_free_alloca(p)
-#else
-# define tsrm_do_alloca(p)   malloc(p)
-# define tsrm_free_alloca(p) free(p)
-#endif
-
-#endif /* TSRM_CONFIG_COMMON_H */

TSRM/tsrm_strtok_r.c

@@ -1,63 +0,0 @@
-#include <stdio.h>
-
-#include "tsrm_config_common.h"
-#include "tsrm_strtok_r.h"
-
-static inline int in_character_class(char ch, const char *delim)
-{
-	while (*delim) {
-		if (*delim == ch) {
-			return 1;
-		}
-		delim++;
-	}
-	return 0;
-}
-
-char *tsrm_strtok_r(char *s, const char *delim, char **last)
-{
-	char *token;
-
-	if (s == NULL) {
-		s = *last;
-	}
-
-	while (*s && in_character_class(*s, delim)) {
-		s++;
-	}
-	if (!*s) {
-		return NULL;
-	}
-
-	token = s;
-
-	while (*s && !in_character_class(*s, delim)) {
-		s++;
-	}
-	if (!*s) {
-		*last = s;
-	} else {
-		*s = '\0';
-		*last = s + 1;
-	}
-	return token;
-}
-
-#if 0
-
-main()
-{
-	char foo[] = "/foo/bar//\\barbara";
-	char *last;
-	char *token;
-
-	token = tsrm_strtok_r(foo, "/\\", &last);
-	while (token) {
-		printf ("Token = '%s'\n", token);
-		token = tsrm_strtok_r(NULL, "/\\", &last);
-	}
-	
-	return 0;
-}
-
-#endif

TSRM/tsrm_strtok_r.h

@@ -1,6 +0,0 @@
-#ifndef TSRM_STRTOK_R
-#define TSRM_STRTOK_R
-
-char *tsrm_strtok_r(char *s, const char *delim, char **last);
-
-#endif

TSRM/tsrm_virtual_cwd.c

@@ -1,787 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.txt.                                 |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Sascha Schumann <sascha@schumann.cx>                        |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdio.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include "tsrm_virtual_cwd.h"
-#include "tsrm_strtok_r.h"
-
-#ifdef TSRM_WIN32
-#include <io.h>
-#endif
-
-#define VIRTUAL_CWD_DEBUG 0
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-/* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */
-#if defined(TSRM_WIN32) && defined(ZTS)
-MUTEX_T cwd_mutex;
-#endif
-
-#ifdef ZTS
-static ts_rsrc_id cwd_globals_id;
-#else
-static virtual_cwd_globals cwd_globals;
-#endif
-
-cwd_state main_cwd_state; /* True global */
-
-#ifndef TSRM_WIN32
-#include <unistd.h>
-#else
-#include <direct.h>
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(mode) ((mode) & _S_IFDIR)
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(mode) ((mode) & _S_IFREG)
-#endif
-
-#ifdef TSRM_WIN32
-#define tsrm_strtok_r(a,b,c) strtok((a),(b))
-#define TOKENIZER_STRING "/\\"
-	
-static int php_check_dots(const char *element, int n) 
-{
-	while (n-- > 0) if (element[n] != '.') break;
-
-	return (n != -1);
-}
-	
-#define IS_DIRECTORY_UP(element, len) \
-	(len >= 2 && !php_check_dots(element, len))
-
-#define IS_DIRECTORY_CURRENT(element, len) \
-	(len == 1 && ptr[0] == '.')
-
-
-#else
-#define TOKENIZER_STRING "/"
-#endif
-
-
-/* default macros */
-
-#ifndef IS_DIRECTORY_UP
-#define IS_DIRECTORY_UP(element, len) \
-	(len == 2 && memcmp(element, "..", 2) == 0)
-#endif
-
-#ifndef IS_DIRECTORY_CURRENT
-#define IS_DIRECTORY_CURRENT(element, len) \
-	(len == 1 && ptr[0] == '.')
-#endif
-
-/* define this to check semantics */
-#define IS_DIR_OK(s) (1)
-	
-#ifndef IS_DIR_OK
-#define IS_DIR_OK(state) (php_is_dir_ok(state) == 0)
-#endif
-
-
-#define CWD_STATE_COPY(d, s)				\
-	(d)->cwd_length = (s)->cwd_length;		\
-	(d)->cwd = (char *) malloc((s)->cwd_length+1);	\
-	memcpy((d)->cwd, (s)->cwd, (s)->cwd_length+1);
-
-#define CWD_STATE_FREE(s)			\
-	free((s)->cwd);
-	
-static int php_is_dir_ok(const cwd_state *state) 
-{
-	struct stat buf;
-
-	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
-		return (0);
-
-	return (1);
-}
-
-static int php_is_file_ok(const cwd_state *state) 
-{
-	struct stat buf;
-
-	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
-		return (0);
-
-	return (1);
-}
-
-static void cwd_globals_ctor(virtual_cwd_globals *cwd_globals)
-{
-	CWD_STATE_COPY(&cwd_globals->cwd, &main_cwd_state);
-}
-
-static void cwd_globals_dtor(virtual_cwd_globals *cwd_globals)
-{
-	CWD_STATE_FREE(&cwd_globals->cwd);
-}
-
-static char *tsrm_strndup(const char *s, size_t length)
-{
-    char *p;
-
-    p = (char *) malloc(length+1);
-    if (!p) {
-        return (char *)NULL;
-    }
-    if (length) {
-        memcpy(p,s,length);
-    }
-    p[length]=0;
-    return p;
-}
-
-CWD_API void virtual_cwd_startup(void)
-{
-	char cwd[MAXPATHLEN];
-	char *result;
-
-	result = getcwd(cwd, sizeof(cwd));	
-	if (!result) {
-		cwd[0] = '\0';
-	}
-	main_cwd_state.cwd = strdup(cwd);
-	main_cwd_state.cwd_length = strlen(cwd);
-
-#ifdef ZTS
-	cwd_globals_id = ts_allocate_id(sizeof(virtual_cwd_globals), (ts_allocate_ctor) cwd_globals_ctor, (ts_allocate_dtor) cwd_globals_dtor);
-#else
-	cwd_globals_ctor(&cwd_globals);
-#endif
-
-#if defined(TSRM_WIN32) && defined(ZTS)
-	cwd_mutex = tsrm_mutex_alloc();
-#endif
-}
-
-CWD_API void virtual_cwd_shutdown(void)
-{
-#ifndef ZTS
-	cwd_globals_dtor(&cwd_globals);
-#endif
-#if defined(TSRM_WIN32) && defined(ZTS)
-	tsrm_mutex_free(cwd_mutex);
-#endif
-
-	free(main_cwd_state.cwd); /* Don't use CWD_STATE_FREE because the non global states will probably use emalloc()/efree() */
-}
-
-CWD_API char *virtual_getcwd_ex(size_t *length)
-{
-	cwd_state *state;
-	CWDLS_FETCH();
-
-	state = &CWDG(cwd);
-
-	if (state->cwd_length == 0) {
-		char *retval;
-
-		*length = 1;
-		retval = (char *) malloc(2);
-		retval[0] = DEFAULT_SLASH;
-		retval[1] = '\0';	
-		return retval;
-	}
-
-#ifdef TSRM_WIN32
-	/* If we have something like C: */
-	if (state->cwd_length == 2 && state->cwd[state->cwd_length-1] == ':') {
-		char *retval;
-
-		*length = state->cwd_length+1;
-		retval = (char *) malloc(*length+1);
-		memcpy(retval, state->cwd, *length);
-		retval[*length-1] = DEFAULT_SLASH;
-		retval[*length] = '\0';
-		return retval;
-	}
-#endif
-	*length = state->cwd_length;
-	return strdup(state->cwd);
-}
-
-
-/* Same semantics as UNIX getcwd() */
-CWD_API char *virtual_getcwd(char *buf, size_t size)
-{
-	size_t length;
-	char *cwd;
-
-	cwd = virtual_getcwd_ex(&length);
-
-	if (buf == NULL) {
-		return cwd;
-	}
-	if (length > size-1) {
-		free(cwd);
-		errno = ERANGE; /* Is this OK? */
-		return NULL;
-	}
-	memcpy(buf, cwd, length+1);
-	free(cwd);
-	return buf;
-}
-
-/* Resolve path relatively to state and put the real path into state */
-/* returns 0 for ok, 1 for error */
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path)
-{
-	int path_length = strlen(path);
-	char *ptr, *path_copy;
-	char *tok = NULL;
-	int ptr_length;
-	cwd_state *old_state;
-	int ret = 0;
-	int copy_amount = -1;
-	char *free_path;
-	unsigned char is_absolute = 0;
-#ifndef TSRM_WIN32
-	char resolved_path[MAXPATHLEN];
-#endif
-
-	if (path_length == 0) 
-		return (0);
-
-#if !defined(TSRM_WIN32) && !defined(__BEOS__)
-	if (IS_ABSOLUTE_PATH(path, path_length)) {
-		if (realpath(path, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
-		}
-	} else { /* Concat current directory with relative path and then run realpath() on it */
-		char *tmp;
-		char *ptr;
-
-		ptr = tmp = (char *) malloc(state->cwd_length+path_length+sizeof("/"));
-		if (!tmp) {
-			return 1;
-		}
-		memcpy(ptr, state->cwd, state->cwd_length);
-		ptr += state->cwd_length;
-		*ptr++ = DEFAULT_SLASH;
-		memcpy(ptr, path, path_length);
-		ptr += path_length;
-		*ptr = '\0';
-		if (realpath(tmp, resolved_path)) {
-			path = resolved_path;
-			path_length = strlen(path);
-		}
-		free(tmp);
-	}
-#endif
-	free_path = path_copy = tsrm_strndup(path, path_length);
-
-	old_state = (cwd_state *) malloc(sizeof(cwd_state));
-	CWD_STATE_COPY(old_state, state);
-#if VIRTUAL_CWD_DEBUG
-	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
-#endif
-	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
-		copy_amount = COPY_WHEN_ABSOLUTE;
-		is_absolute = 1;
-#ifdef TSRM_WIN32
-	} else if(IS_SLASH(path_copy[0])) {
-		copy_amount = 2;
-#endif
-	}
-
-	if (copy_amount != -1) {
-		state->cwd = (char *) realloc(state->cwd, copy_amount + 1);
-		if (copy_amount) {
-			if (is_absolute) {
-				memcpy(state->cwd, path_copy, copy_amount);
-				path_copy += copy_amount;
-			} else {
-				memcpy(state->cwd, old_state->cwd, copy_amount);
-			}
-		}
-		state->cwd[copy_amount] = '\0';
-		state->cwd_length = copy_amount;
-	}
-
-
-	ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
-	while (ptr) {
-		ptr_length = strlen(ptr);
-
-		if (IS_DIRECTORY_UP(ptr, ptr_length)) {
-			char save;
-
-			save = DEFAULT_SLASH;
-
-#define PREVIOUS state->cwd[state->cwd_length - 1]
-
-			while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
-					!IS_SLASH(PREVIOUS)) {
-				save = PREVIOUS;
-				PREVIOUS = '\0';
-				state->cwd_length--;
-			}
-
-			if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
-				state->cwd[state->cwd_length++] = save;
-				state->cwd[state->cwd_length] = '\0';
-			} else {
-				PREVIOUS = '\0';
-				state->cwd_length--;
-			}
-		} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
-			state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
-			state->cwd[state->cwd_length] = DEFAULT_SLASH;
-			memcpy(&state->cwd[state->cwd_length+1], ptr, ptr_length+1);
-			state->cwd_length += (ptr_length+1);
-		}
-		ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
-	}
-
-	if (state->cwd_length == COPY_WHEN_ABSOLUTE) {
-		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
-		state->cwd[state->cwd_length] = DEFAULT_SLASH;
-		state->cwd[state->cwd_length+1] = '\0';
-		state->cwd_length++;
-	}
-
-	if (verify_path && verify_path(state)) {
-		CWD_STATE_FREE(state);
-
-		*state = *old_state;
-
-		ret = 1;
-	} else {
-		CWD_STATE_FREE(old_state);
-		ret = 0;
-	}
-	
-	free(old_state);
-	
-	free(free_path);
-#if VIRTUAL_CWD_DEBUG
-	fprintf (stderr, "virtual_file_ex() = %s\n",state->cwd);
-#endif
-	return (ret);
-}
-
-CWD_API int virtual_chdir(const char *path)
-{
-	CWDLS_FETCH();
-
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
-}
-
-CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path))
-{
-	int length = strlen(path);
-	char *temp;
-	int retval;
-
-	if (length == 0) {
-		return 1; /* Can't cd to empty string */
-	}	
-	while(--length >= 0 && !IS_SLASH(path[length])) {
-	}
-
-	if (length == -1) {
-		/* No directory only file name */
-		errno = ENOENT;
-		return -1;
-	}
-
-	if (length == COPY_WHEN_ABSOLUTE && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
-		length++;
-	}
-	temp = (char *) tsrm_do_alloca(length+1);
-	memcpy(temp, path, length);
-	temp[length] = 0;
-#if VIRTUAL_CWD_DEBUG
-	fprintf (stderr, "Changing directory to %s\n", temp);
-#endif
-	retval = p_chdir(temp);
-	tsrm_free_alloca(temp);
-	return retval;
-}
-
-CWD_API char *virtual_realpath(const char *path, char *real_path)
-{
-	cwd_state new_state;
-	int retval;
-    CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, NULL);
-	
-	if (!retval) {
-		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
-		memcpy(real_path, new_state.cwd, len);
-		real_path[len] = '\0';
-		return real_path;
-	}
-
-	return NULL;
-}
-
-CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path);
-
-	*filepath = new_state.cwd;
-
-	return retval;
-
-}
-
-CWD_API int virtual_filepath(const char *path, char **filepath)
-{
-	return virtual_filepath_ex(path, filepath, php_is_file_ok);
-}
-
-CWD_API FILE *virtual_fopen(const char *path, const char *mode)
-{
-	cwd_state new_state;
-	FILE *f;
-	CWDLS_FETCH();
-
-	if (path[0] == '\0') { /* Fail to open empty path */
-		return NULL;
-	}
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	f = fopen(new_state.cwd, mode);
-
-	CWD_STATE_FREE(&new_state);
-	return f;
-}
-
-#if HAVE_UTIME
-CWD_API int virtual_utime(const char *filename, struct utimbuf *buf)
-{
-	cwd_state new_state;
-	int ret;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL);
-
-	ret = utime(new_state.cwd, buf);
-
-	CWD_STATE_FREE(&new_state);
-	return ret;
-}
-#endif
-
-CWD_API int virtual_chmod(const char *filename, mode_t mode)
-{
-	cwd_state new_state;
-	int ret;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL);
-
-	ret = chmod(new_state.cwd, mode);
-
-	CWD_STATE_FREE(&new_state);
-	return ret;
-}
-
-#ifndef TSRM_WIN32
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group)
-{
-	cwd_state new_state;
-	int ret;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL);
-
-	ret = chown(new_state.cwd, owner, group);
-
-	CWD_STATE_FREE(&new_state);
-	return ret;
-}
-#endif
-
-CWD_API int virtual_open(const char *path, int flags, ...)
-{
-	cwd_state new_state;
-	int f;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	if (flags & O_CREAT) {
-		mode_t mode;
-		va_list arg;
-
-		va_start(arg, flags);
-		mode = va_arg(arg, mode_t);
-		va_end(arg);
-
-		f = open(new_state.cwd, flags, mode);
-	} else {
-		f = open(new_state.cwd, flags);
-	}	
-	CWD_STATE_FREE(&new_state);
-	return f;
-}
-
-CWD_API int virtual_creat(const char *path, mode_t mode)
-{
-	cwd_state new_state;
-	int f;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	f = creat(new_state.cwd,  mode);
-
-	CWD_STATE_FREE(&new_state);
-	return f;
-}
-
-CWD_API int virtual_rename(char *oldname, char *newname)
-{
-	cwd_state old_state;
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	virtual_file_ex(&old_state, oldname, NULL);
-	oldname = old_state.cwd;
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, newname, NULL);
-	newname = new_state.cwd;
- 
-	retval = rename(oldname, newname);
-
-	CWD_STATE_FREE(&old_state);
-	CWD_STATE_FREE(&new_state);
-
-	return retval;
-}
-
-CWD_API int virtual_stat(const char *path, struct stat *buf)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	retval = stat(new_state.cwd, buf);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-#ifndef TSRM_WIN32
-
-CWD_API int virtual_lstat(const char *path, struct stat *buf)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	retval = lstat(new_state.cwd, buf);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-#endif
-
-CWD_API int virtual_unlink(const char *path)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL);
-
-	retval = unlink(new_state.cwd);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-CWD_API int virtual_mkdir(const char *pathname, mode_t mode)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
-
-#ifdef TSRM_WIN32
-	retval = mkdir(new_state.cwd);
-#else
-	retval = mkdir(new_state.cwd, mode);
-#endif
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-CWD_API int virtual_rmdir(const char *pathname)
-{
-	cwd_state new_state;
-	int retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
-
-	retval = rmdir(new_state.cwd);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-#ifdef TSRM_WIN32
-DIR *opendir(const char *name);
-#endif
-
-CWD_API DIR *virtual_opendir(const char *pathname)
-{
-	cwd_state new_state;
-	DIR *retval;
-	CWDLS_FETCH();
-
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL);
-
-	retval = opendir(new_state.cwd);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-
-#ifndef TSRM_WIN32
-
-CWD_API FILE *virtual_popen(const char *command, const char *type)
-{
-	int command_length;
-	char *command_line;
-	char *ptr;
-	FILE *retval;
-	CWDLS_FETCH();
-
-	command_length = strlen(command);
-
-	ptr = command_line = (char *) malloc(command_length + sizeof("cd  ; ") + CWDG(cwd).cwd_length+1);
-	if (!command_line) {
-		return NULL;
-	}
-	memcpy(ptr, "cd ", sizeof("cd ")-1);
-	ptr += sizeof("cd ")-1;
-
-	if (CWDG(cwd).cwd_length == 0) {
-		*ptr++ = DEFAULT_SLASH;
-	} else {
-		memcpy(ptr, CWDG(cwd).cwd, CWDG(cwd).cwd_length);
-		ptr += CWDG(cwd).cwd_length;
-	}
-	
-	*ptr++ = ' ';
-	*ptr++ = ';';
-	*ptr++ = ' ';
-
-	memcpy(ptr, command, command_length+1);
-#ifdef TSRM_WIN32
-	retval = _popen(command_line, type);
-#else
-	retval = popen(command_line, type);
-#endif
-	free(command_line);
-	return retval;
-}
-
-#else
-
-/* On Windows the trick of prepending "cd cwd; " doesn't work so we need to perform
-   a real chdir() and mutex it
- */
-CWD_API FILE *virtual_popen(const char *command, const char *type)
-{
-	char prev_cwd[MAXPATHLEN];
-	char *getcwd_result;
-	FILE *retval;
-	CWDLS_FETCH();
-
-	getcwd_result = getcwd(prev_cwd, MAXPATHLEN);
-	if (!getcwd_result) {
-		return NULL;
-	}
-
-#ifdef ZTS
-	tsrm_mutex_lock(cwd_mutex);
-#endif
-
-	chdir(CWDG(cwd).cwd);
-	retval = _popen(command, type);
-	chdir(prev_cwd);
-
-#ifdef ZTS
-	tsrm_mutex_unlock(cwd_mutex);
-#endif
-
-	return retval;
-}
-
-#endif
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

TSRM/tsrm_virtual_cwd.h

@@ -1,212 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP version 4.0                                                      |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.txt.                                 |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Sascha Schumann <sascha@schumann.cx>                        |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef VIRTUAL_CWD_H
-#define VIRTUAL_CWD_H
-
-#include "tsrm_config_common.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.h>
-
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif
-
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#ifndef TSRM_WIN32
-#include <unistd.h>
-#endif
-
-#ifdef TSRM_WIN32
-#include "readdir.h"
-#include <sys/utime.h>
-/* mode_t isn't defined on Windows */
-typedef unsigned short mode_t;
-
-#define DEFAULT_SLASH '\\'
-#define IS_SLASH(c)	((c) == '/' || (c) == '\\')
-#define COPY_WHEN_ABSOLUTE 2
-#define IS_ABSOLUTE_PATH(path, len) \
-	(len >= 2 && isalpha(path[0]) && path[1] == ':')
-
-#else
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-#define DEFAULT_SLASH '/'
-#define IS_SLASH(c)	((c) == '/')
-
-#endif
-
-
-#ifndef COPY_WHEN_ABSOLUTE
-#define COPY_WHEN_ABSOLUTE 0
-#endif
-
-#ifndef IS_ABSOLUTE_PATH	
-#define IS_ABSOLUTE_PATH(path, len) \
-	(IS_SLASH(path[0]))
-#endif
-
-#ifdef TSRM_EXPORTS
-#define CWD_EXPORTS
-#endif
-
-#ifdef TSRM_WIN32
-#       ifdef CWD_EXPORTS
-#       define CWD_API __declspec(dllexport)
-#       else
-#       define CWD_API __declspec(dllimport)
-#       endif
-#else
-#define CWD_API
-#endif
-
-typedef struct _cwd_state {
-	char *cwd;
-	int cwd_length;
-} cwd_state;
-
-typedef int (*verify_path_func)(const cwd_state *);
-
-CWD_API void virtual_cwd_startup(void);
-CWD_API void virtual_cwd_shutdown(void);
-CWD_API char *virtual_getcwd_ex(size_t *length);
-CWD_API char *virtual_getcwd(char *buf, size_t size);
-CWD_API int virtual_chdir(const char *path);
-CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path));
-CWD_API int virtual_filepath(const char *path, char **filepath);
-CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path);
-CWD_API char *virtual_realpath(const char *path, char *real_path);
-CWD_API FILE *virtual_fopen(const char *path, const char *mode);
-CWD_API int virtual_open(const char *path, int flags, ...);
-CWD_API int virtual_creat(const char *path, mode_t mode);
-CWD_API int virtual_rename(char *oldname, char *newname);
-CWD_API int virtual_stat(const char *path, struct stat *buf);
-#ifndef TSRM_WIN32
-CWD_API int virtual_lstat(const char *path, struct stat *buf);
-#endif
-CWD_API int virtual_unlink(const char *path);
-CWD_API int virtual_mkdir(const char *pathname, mode_t mode);
-CWD_API int virtual_rmdir(const char *pathname);
-CWD_API DIR *virtual_opendir(const char *pathname);
-CWD_API FILE *virtual_popen(const char *command, const char *type);
-#if HAVE_UTIME
-CWD_API int virtual_utime(const char *filename, struct utimbuf *buf);
-#endif
-CWD_API int virtual_chmod(const char *filename, mode_t mode);
-#ifndef TSRM_WIN32
-CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group);
-#endif
-
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path);
-
-typedef struct _virtual_cwd_globals {
-	cwd_state cwd;
-} virtual_cwd_globals;
-
-#ifdef ZTS
-# define CWDLS_D  virtual_cwd_globals *cwd_globals
-# define CWDLS_DC , CWDLS_D
-# define CWDLS_C  cwd_globals
-# define CWDLS_CC , CWDLS_C
-# define CWDG(v) (cwd_globals->v)
-# define CWDLS_FETCH()    virtual_cwd_globals *cwd_globals = ts_resource(cwd_globals_id)
-#else
-# define CWDLS_D  void
-# define CWDLS_DC
-# define CWDLS_C
-# define CWDLS_CC
-# define CWDG(v) (cwd_globals.v)
-# define CWDLS_FETCH()
-#endif
-
-/* The actual macros to be used in programs using TSRM
- * If the program defines VIRTUAL_DIR it will use the
- * virtual_* functions 
- */
-
-#ifdef VIRTUAL_DIR
-
-#define V_GETCWD(buff, size) virtual_getcwd(buff,size)
-#define V_FOPEN(path, mode) virtual_fopen(path, mode)
-/* The V_OPEN macro will need to be used as V_OPEN((path, flags, ...)) */
-#define V_OPEN(open_args) virtual_open open_args
-#define V_CREAT(path, mode) virtual_creat(path, mode)
-#define V_CHDIR(path) virtual_chdir(path)
-#define V_CHDIR_FILE(path) virtual_chdir_file(path, virtual_chdir)
-#define V_GETWD(buf)
-#define V_REALPATH(path,real_path) virtual_realpath(path,real_path)
-#define V_RENAME(oldname,newname) virtual_rename(oldname,newname)
-#define V_STAT(path, buff) virtual_stat(path, buff)
-#ifdef TSRM_WIN32
-#define V_LSTAT(path, buff) virtual_stat(path, buff)
-#else
-#define V_LSTAT(path, buff) virtual_lstat(path, buff)
-#endif
-#define V_UNLINK(path) virtual_unlink(path)
-#define V_MKDIR(pathname, mode) virtual_mkdir(pathname, mode)
-#define V_RMDIR(pathname) virtual_rmdir(pathname)
-#define V_OPENDIR(pathname) virtual_opendir(pathname)
-#define V_POPEN(command, type) virtual_popen(command, type)
-#if HAVE_UTIME
-#define V_UTIME(path,time) virtual_utime(path,time)
-#endif
-#define V_CHMOD(path,mode) virtual_chmod(path,mode)
-#ifndef TSRM_WIN32
-#define V_CHOWN(path,owner,group) virtual_chown(path,owner,group)
-#endif
-
-#else
-
-#define V_GETCWD(buff, size) getcwd(buff,size)
-#define V_FOPEN(path, mode)  fopen(path, mode)
-#define V_OPEN(open_args) open open_args
-#define V_CREAT(path, mode) creat(path, mode)
-#define V_RENAME(oldname,newname) rename(oldname,newname)
-#define V_CHDIR(path) chdir(path)
-#define V_CHDIR_FILE(path) virtual_chdir_file(path, chdir)
-#define V_GETWD(buf) getwd(buf)
-#define V_STAT(path, buff) stat(path, buff)
-#define V_LSTAT(path, buff) lstat(path, buff)
-#define V_UNLINK(path) unlink(path)
-#define V_MKDIR(pathname, mode) mkdir(pathname, mode)
-#define V_RMDIR(pathname) rmdir(pathname)
-#define V_OPENDIR(pathname) opendir(pathname)
-#define V_POPEN(command, type) popen(command, type)
-#define V_REALPATH(path,real_path) realpath(path,real_path)
-#if HAVE_UTIME
-#define V_UTIME(path,time) utime(path,time)
-#endif
-#define V_CHMOD(path,mode) chmod(path,mode)
-#ifndef TSRM_WIN32
-#define V_CHOWN(path,owner,group) chown(path,owner,group)
-#endif
-
-#endif
-
-#endif /* VIRTUAL_CWD_H */

WISHLIST

@@ -0,0 +1,17 @@
+- Persistant per-process scripting
+
+  Apache 1.3 has added things that makes this much easier than before.
+  The module structure now contains a child_init hook and a child_exit 
+  hook where you can register functions to be called when an httpd
+  process starts up and when one shuts down (due to MaxRequestsPerChild 
+  or a Kill).  The only real trick now is to come up with some sort of
+  syntax for specifying what to do from the child_init call and the
+  child_exit call.
+
+  One idea is to be able to add a <PHP>...</PHP> block to the Apache
+  httpd.conf file which would somehow define a series of PHP statements
+  to be executed from the child_* calls.  One for startup and another
+  block for shutdown.  These blocks would work with the per-process
+  memory pool, so any variables initialized here would have a lifespan
+  equal to that of the httpd process.  Basically request-spanning
+  global variables.

WISHLIST-3.1

@@ -0,0 +1,55 @@
+V Do yystype_ptr and hash pointers the right way - use the hash
+  pointer and the bucket pointer, instead of a pointer to the data.
+  Allows for a real unset() among other things.
+V Improve performance of simple variable lookups
+* Improve string performance by using smarter memory allocation methods
+- Improve preprocessor (handle require() efficiently), possibly handle
+  automatic preprocessing for sites based on timestamp
+V Use a reference count mechanism to prevent unnecessary duplication of data.
+* Write and stabilize a complete persistent data API.  Feature wishlist:
+  - memory manager using shared memory
+  - process-global symbol table
+  - make api inter-thread capable for win32 and some far off future where unix
+    version will be multithreaded
+V Handle out of memory (inside emalloc()?)
+* Try to figure out a way to declare *real* global variables
+* Improve the reading of configuration variables into php3_ini (generalize)
+  Make it possible to implement config_get("configuration_variable") and
+  config_set("configuration_variable","value") that'll work with *php3_ini*,
+  not the configuration hash!
+* Bundle some nice classes (like Bjørn's graphing class)
+* Bundle some database abstraction classes
+* Distribute binaries
+* Clean up API and modules to make .so modules portable across CGI and server
+  binaries
+* dbm cleanup (don't arbitrarily pick, and support multiple concurrent formats)
+* start system defines so that we can move away from the standard c lib on
+  windows to the win32 lib.  (file functions primarily)
+* COM implementation so php can be used as an asp language (cant find any docs
+  on how this is done though)
+* Clean up the file structure so the top-level directory isn't such a mess.
+* Bring the module concept to maturity: use libtool and make it
+  possible to decide at compile time whether you want to compile a
+  module statically or dynamically.  Remove the distinction between
+  the stuff currently in dl/ and functions/.
+* a way of letting each module specify its options, so ini file options and
+  Apache directives can be set up from the same specification.
+V Make it possible to declare smarter user functions: (done in 3.0)
+  - Optional parameters
+  - Parameters that are forced/prefered by reference
+* Make object parsing more general, and allow nested arrays/objects with
+  unlimited levels.
+V Make it possible to copy references of variables.
+* data tainting (like perl -T)
+* multi-dimensional array support in GET/POST/COOKIE handling code
+* Persistent functions and classes
+* odbc_fetch_assoc
+* Add env handling to gpc_order
+* Populate track_vars regardless of gpc_order
+* a real exec() function
+* Support passing arguments to functions by name (e.g. foo(arg1 => "bar", arg2 => "foobar"))
+* Add an optional setting to destroy persistent resources if a PHP script terminates
+  abnormally
+V COM automation support for Win32
+? Add a setting for making function names case sensitive
+* stat() files before feeding them to flex - it doesn't handle special files very well

Zend/FlexLexer.h

@@ -1,186 +0,0 @@
-// $Header$
-
-// FlexLexer.h -- define interfaces for lexical analyzer classes generated
-//		  by flex
-
-// Copyright (c) 1993 The Regents of the University of California.
-// All rights reserved.
-//
-// This code is derived from software contributed to Berkeley by
-// Kent Williams and Tom Epperly.
-//
-// Redistribution and use in source and binary forms with or without
-// modification are permitted provided that: (1) source distributions retain
-// this entire copyright notice and comment, and (2) distributions including
-// binaries display the following acknowledgement:  ``This product includes
-// software developed by the University of California, Berkeley and its
-// contributors'' in the documentation or other materials provided with the
-// distribution and in all advertising materials mentioning features or use
-// of this software.  Neither the name of the University nor the names of
-// its contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-
-// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-// This file defines FlexLexer, an abstract class which specifies the
-// external interface provided to flex C++ lexer objects, and yyFlexLexer,
-// which defines a particular lexer class.
-//
-// If you want to create multiple lexer classes, you use the -P flag
-// to rename each yyFlexLexer to some other xxFlexLexer.  You then
-// include <FlexLexer.h> in your other sources once per lexer class:
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer xxFlexLexer
-//	#include <FlexLexer.h>
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer zzFlexLexer
-//	#include <FlexLexer.h>
-//	...
-
-#ifndef FLEXLEXER_H
-// Never included before - need to define base class.
-#define FLEXLEXER_H
-#include <iostream.h>
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer {
-public:
-	virtual ~FlexLexer()	{ }
-
-	const char* YYText()	{ return yytext; }
-	int YYLeng()		{ return yyleng; }
-
-	virtual void
-		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
-	virtual struct yy_buffer_state*
-		yy_create_buffer( istream* s, int size ) = 0;
-	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
-	virtual void yyrestart( istream* s ) = 0;
-
-	virtual int yylex() = 0;
-
-	// Call yylex with new input/output sources.
-	int yylex( istream* new_in, ostream* new_out = 0 )
-		{
-		switch_streams( new_in, new_out );
-		return yylex();
-		}
-
-	// Switch to new input/output streams.  A nil stream pointer
-	// indicates "keep the current one".
-	virtual void switch_streams( istream* new_in = 0,
-					ostream* new_out = 0 ) = 0;
-
-	int lineno() const		{ return yylineno; }
-
-	int debug() const		{ return yy_flex_debug; }
-	void set_debug( int flag )	{ yy_flex_debug = flag; }
-
-protected:
-	char* yytext;
-	int yyleng;
-	int yylineno;		// only maintained if you use %option yylineno
-	int yy_flex_debug;	// only has effect with -d or "%option debug"
-};
-
-}
-#endif
-
-#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
-// Either this is the first time through (yyFlexLexerOnce not defined),
-// or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex man page.
-#define yyFlexLexerOnce
-
-class yyFlexLexer : public FlexLexer {
-public:
-	// arg_yyin and arg_yyout default to the cin and cout, but we
-	// only make that assignment when initializing in yylex().
-	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
-
-	virtual ~yyFlexLexer();
-
-	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
-	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
-	void yy_delete_buffer( struct yy_buffer_state* b );
-	void yyrestart( istream* s );
-
-	virtual int yylex();
-	virtual void switch_streams( istream* new_in, ostream* new_out );
-
-protected:
-	virtual int LexerInput( char* buf, int max_size );
-	virtual void LexerOutput( const char* buf, int size );
-	virtual void LexerError( const char* msg );
-
-	void yyunput( int c, char* buf_ptr );
-	int yyinput();
-
-	void yy_load_buffer_state();
-	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
-	void yy_flush_buffer( struct yy_buffer_state* b );
-
-	int yy_start_stack_ptr;
-	int yy_start_stack_depth;
-	int* yy_start_stack;
-
-	void yy_push_state( int new_state );
-	void yy_pop_state();
-	int yy_top_state();
-
-	yy_state_type yy_get_previous_state();
-	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
-	int yy_get_next_buffer();
-
-	istream* yyin;	// input source for default LexerInput
-	ostream* yyout;	// output sink for default LexerOutput
-
-	struct yy_buffer_state* yy_current_buffer;
-
-	// yy_hold_char holds the character lost when yytext is formed.
-	char yy_hold_char;
-
-	// Number of characters read into yy_ch_buf.
-	int yy_n_chars;
-
-	// Points to current character in buffer.
-	char* yy_c_buf_p;
-
-	int yy_init;		// whether we need to initialize
-	int yy_start;		// start state number
-
-	// Flag which is used to allow yywrap()'s to do buffer switches
-	// instead of setting up a fresh yyin.  A bit of a hack ...
-	int yy_did_buffer_switch_on_eof;
-
-	// The following are not always needed, but may be depending
-	// on use of certain flex features (like REJECT or yymore()).
-
-	yy_state_type yy_last_accepting_state;
-	char* yy_last_accepting_cpos;
-
-	yy_state_type* yy_state_buf;
-	yy_state_type* yy_state_ptr;
-
-	char* yy_full_match;
-	int* yy_full_state;
-	int yy_full_lp;
-
-	int yy_lp;
-	int yy_looking_for_trail_begin;
-
-	int yy_more_flag;
-	int yy_more_len;
-	int yy_more_offset;
-	int yy_prev_more_offset;
-};
-
-#endif

Zend/LICENSE

@@ -1,116 +1,37 @@
----------------------------------------------------------------------------
-                    The Zend License, version 0.92
-           Copyright (C) 1999-2001    Zend Technologies Ltd.
----------------------------------------------------------------------------
+Zend Temporary License
+======================
 
-The Zend scripting engine library is a product of Zend Technologies Ltd.
-It may be used and/or distributed under the terms of the Q Public
-License (QPL) version 1.0, enclosed below.
+This is a temporary license, that is in effect until the final Zend license
+is available.
 
-For more information about Zend please visit http://www.zend.com/
-For license related questions please mail license@zend.com
+* The final license will include the ability to distribute Zend freely,
+  as a part of PHP (in both compiled and source code formats).  It may
+  (and probably will) allow to redistribute Zend under other circumstances
+  as well, but at the very least, it'll be freely distributed as a part
+  of PHP.
 
-===========================================================================
+* The source code in the Zend engine is the property of Andi Gutmans and
+  Zeev Suraski.  Parts of this code are based on source code taken from
+  PHP 3.0, which may include several patches and enhancements that weren't
+  made by us (Andi&Zeev).  If you're the author of such a patch and you're
+  not willing to give up ownership over your patch to us, please contact
+  us as soon as possible, so we can remove it.  We're doing this so that
+  we'd be eligible to sell the Zend engine for uses other than PHP, most
+  notably - as an embedded part of possible commercial products that we'd
+  have.
 
-			     THE Q PUBLIC LICENSE
-				  version 1.0
+* Patches submitted to the Zend CVS automatically fall under this license,
+  and by submitting them you're implicitly giving up your ownership over
+  this patch to us.
 
-		   Copyright (C) 1999 Troll Tech AS, Norway.
-		       Everyone is permitted to copy and
-		       distribute this license document.
-
-The intent of this license is to establish freedom to share and change the
-software regulated by this license under the open source model.
-
-This license applies to any software containing a notice placed by the
-copyright holder saying that it may be distributed under the terms of
-the Q Public License version 1.0.  Such software is herein referred to as
-the Software.  This license covers modification and distribution of the
-Software, use of third-party application programs based on the Software,
-and development of free software which uses the Software.
-
-				 Granted Rights
-
-1. You are granted the non-exclusive rights set forth in this license
-   provided you agree to and comply with any and all conditions in this
-   license.  Whole or partial distribution of the Software, or software
-   items that link with the Software, in any form signifies acceptance of
-   this license.
-
-2. You may copy and distribute the Software in unmodified form provided
-   that the entire package, including - but not restricted to - copyright,
-   trademark notices and disclaimers, as released by the initial developer
-   of the Software, is distributed.
-
-3. You may make modifications to the Software and distribute your
-   modifications, in a form that is separate from the Software, such as
-   patches. The following restrictions apply to modifications:
-
-     a. Modifications must not alter or remove any copyright notices in
-        the Software.
-
-     b. When modifications to the Software are released under this
-        license, a non-exclusive royalty-free right is granted to the
-        initial developer of the Software to distribute your modification
-        in future versions of the Software provided such versions remain
-        available under these terms in addition to any other license(s) of
-        the initial developer.
-
-4. You may distribute machine-executable forms of the Software or
-   machine-executable forms of modified versions of the Software, provided
-   that you meet these restrictions:
-
-     a. You must include this license document in the distribution.
-
-     b. You must ensure that all recipients of the machine-executable forms
-        are also able to receive the complete machine-readable source code
-        to the distributed Software, including all modifications, without
-        any charge beyond the costs of data transfer, and place prominent
-        notices in the distribution explaining this.
-
-     c. You must ensure that all modifications included in the
-        machine-executable forms are available under the terms of this
-        license.
-
-5. You may use the original or modified versions of the Software to
-   compile, link and run application programs legally developed by you
-   or by others.
-
-6. You may develop application programs, reusable components and other
-   software items that link with the original or modified versions of the
-   Software.  These items, when distributed, are subject to the following
-   requirements:
-
-     a. You must ensure that all recipients of machine-executable forms of
-        these items are also able to receive and use the complete
-        machine-readable source code to the items without any charge
-        beyond the costs of data transfer.
-
-     b. You must explicitly license all recipients of your items to use
-        and re-distribute original and modified versions of the items in
-        both machine-executable and source code forms. The recipients must
-        be able to do so without any charges whatsoever, and they must be
-        able to re-distribute to anyone they choose.
+* Until further notice, Zend is in a status of a closed beta test.  That means
+  that only people that were explicitly given the right to access the Zend
+  CVS repository are allowed to use it.  If you're reading this file and you
+  weren't explicitly given the right to access the Zend CVS repository from
+  either Andi Gutmans or Zeev Suraski - you're not supposed to have it - please
+  erase the Zend files from your system.  When the closed beta period finishes,
+  the Zend CVS tree will be open for the public (in read-only mode, of course).
 
 
-     c. If the items are not available to the general public, and the
-        initial developer of the Software requests a copy of the items,
-        then you must supply one.
-
-			    Limitations of Liability
-
-In no event shall the initial developers or copyright holders be liable
-for any damages whatsoever, including - but not restricted to - lost
-revenue or profits or other direct, indirect, special, incidental or
-consequential damages, even if they have been advised of the possibility
-of such damages, except to the extent invariable law, if any, provides
-otherwise.
-
-			          No Warranty
-
-The Software and this license document are provided AS IS with NO WARRANTY
-OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE.
-
-
-===========================================================================
+Any questions regarding Zend or this license should be addressed via Email to
+zend@zend.com.

Zend/Makefile.am

@@ -1,60 +0,0 @@
-## Process this file with automake to produce Makefile.in -*- makefile -*-
-
-#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output
-
-AUTOMAKE_OPTIONS=foreign
-EXTRA_LTLIBRARIES=libZend_cc.la libZend_c.la
-noinst_LTLIBRARIES=$(ZEND_SCANNER) libZend.la
-
-libZend_cc_la_SOURCES=zend_language_scanner_cc.cc zend_ini_scanner_cc.cc
-libZend_c_la_SOURCES=zend_language_scanner.c zend_ini_scanner.c
-
-libZend_la_SOURCES=\
-	zend_language_parser.y \
-	zend_ini_parser.y \
-	zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
-	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
-	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
-	zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-	zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
-	zend_ini.c
-
-libZend_la_LIBADD = $(ZEND_SCANNER)
-libZend_la_LDFLAGS = @EXTRA_LIBS@
-libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
-
-# automake isn't too clever about "non-standard" use of lex and yacc
-
-$(libZend_la_OBJECTS) zend_language_scanner.lo zend_language_scanner_cc.lo: zend_language_parser.h
-
-zend_ini_scanner.lo zend_ini_scanner_cc.lo: zend_ini_parser.h
-
-# Language parser/scanner rules
-
-zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	$(LEX) -Pzend -o$@ -i $(srcdir)/zend_language_scanner.l
-
-zend_language_scanner_cc.cc: $(srcdir)/zend_language_scanner.l
-	$(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pzend -o$@ $(srcdir)/zend_language_scanner.l
-
-zend_language_parser.h: zend_language_parser.c
-zend_language_parser.c: $(srcdir)/zend_language_parser.y
-	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c
-
-# INI parser/scanner rules
-
-zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
-	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c
-
-zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	$(LEX) -Pini_ -o$@ -i $(srcdir)/zend_ini_scanner.l
-
-zend_ini_scanner_cc.cc: $(srcdir)/zend_ini_scanner.l
-	$(LEX) -+ -B -i -S$(srcdir)/flex.skl -Pini_ -o$@ $(srcdir)/zend_ini_scanner.l
-zend_ini_parser.h: zend_ini_parser.c
-
-depend:
-
-zend_execute.lo: $(srcdir)/zend_execute.c
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c
-

Zend/Makefile.in

@@ -0,0 +1,145 @@
+CC = @CC@
+AR = ar rc
+LIBNAME = libzend.a
+PROF_CFLAGS =
+CFLAGS_SHLIB = @CFLAGS_SHLIB@
+LDFLAGS_SHLIB = @LDFLAGS_SHLIB@
+LDFLAGS_SHLIB_EXPORT = @LDFLAGS_SHLIB_EXPORT@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) @DEBUG_CFLAGS@ $(PROF_CFLAGS)
+LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT)
+RANLIB = @RANLIB@
+YACC = @YACC@
+
+SOURCE = zend_alloc.c zend_compile.c zend_constants.c zend_execute.c zend_execute_API.c \
+       zend_highlight.c zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
+       zend_stack.c zend_variables.c zend-parser.c zend-scanner.c zend.c zend_API.c zend_extensions.c \
+       zend_hash.c zend_list.c zend_indent.c
+       
+OBJS = zend_alloc.o zend_compile.o zend_constants.o zend_execute.o zend_execute_API.o \
+       zend_highlight.o zend_llist.o zend_opcode.o zend_operators.o zend_ptr_stack.o \
+       zend_stack.o zend_variables.o zend-parser.o zend-scanner.o zend.o zend_API.o zend_extensions.o \
+       zend_hash.o zend_list.o zend_indent.o
+
+LIBS = @LIBS@
+
+all:	$(LIBNAME)
+
+libzend.a: $(OBJS)
+	-rm -f libzend.a
+	$(AR) libzend.a $(OBJS)
+	$(RANLIB) libzend.a
+	
+zend-parser.h zend-parser.c: zend-parser.y
+	bison -p zend -v -d zend-parser.y -o zend-parser.c
+
+zend-scanner.o:
+	$(CC) $(CFLAGS) -w -c zend-scanner.c
+
+zend-scanner.c:  zend-scanner.l
+	flex -Pzend -ozend-scanner.c -i zend-scanner.l
+
+clean:  
+	-rm -f libzend.a *.o
+
+distclean: clean
+	-rm -f *-scanner.c *-parser.[ch] *.output
+	-rm -f config.status config.cache config.log
+	-rm -f Makefile Makefile.depend config.h
+
+.c.o:
+	@rm -f $@
+	$(CC) $(CFLAGS) -c $< -o $@
+	@bn=`echo $@ | sed -e 's#functions/##'`; test -f $@ || \
+	  (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@)
+
+parser-scanner: zend-parser.c zend-parser.h zend-scanner.c
+
+depend:	parser-scanner
+	$(CC) $(CFLAGS) -MM $(SOURCE) | perl -pe 's|regex/regex.h||;' > Makefile.depend
+
+
+zend_alloc.o: zend_alloc.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h zend_globals.h zend_stack.h \
+ zend_ptr_stack.h zend_compile.h zend-parser.h zend_execute.h
+zend_compile.o: zend_compile.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
+ zend_operators.h
+zend_constants.o: zend_constants.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_constants.h \
+ zend_variables.h zend_operators.h zend_globals.h zend_stack.h \
+ zend_ptr_stack.h zend_compile.h zend-parser.h zend_execute.h
+zend_execute.o: zend_execute.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
+ zend_operators.h zend_constants.h zend_extensions.h
+zend_execute_API.o: zend_execute_API.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
+ zend_operators.h zend_constants.h zend_extensions.h
+zend_highlight.o: zend_highlight.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_highlight.h
+zend_llist.o: zend_llist.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h
+zend_opcode.o: zend_opcode.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_variables.h zend_operators.h zend_extensions.h \
+ zend_API.h modules.h zend_list.h
+zend_operators.o: zend_operators.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_operators.h \
+ zend_variables.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_compile.h zend-parser.h zend_execute.h
+zend_ptr_stack.o: zend_ptr_stack.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_ptr_stack.h
+zend_stack.o: zend_stack.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h zend_stack.h
+zend_variables.o: zend_variables.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_API.h \
+ modules.h zend_list.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_compile.h zend-parser.h zend_execute.h zend_constants.h \
+ zend_variables.h
+zend-parser.o: zend-parser.c zend_compile.h zend.h config.h \
+ config.unix.h zend_errors.h zend_alloc.h zend_hash.h zend_llist.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_list.h zend_API.h modules.h zend_variables.h \
+ zend_operators.h
+zend-scanner.o: zend-scanner.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend-scanner.h zend_highlight.h zend_constants.h \
+ zend_variables.h zend_operators.h
+zend.o: zend.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h zend_operators.h \
+ zend_variables.h zend_extensions.h zend_compile.h zend-parser.h \
+ zend_globals.h zend_stack.h zend_ptr_stack.h zend_execute.h modules.h \
+ zend_constants.h zend_list.h
+zend_API.o: zend_API.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h zend_variables.h zend_execute.h \
+ zend_compile.h zend-parser.h zend_globals.h zend_stack.h \
+ zend_ptr_stack.h zend_API.h modules.h zend_list.h zend_constants.h \
+ zend_operators.h
+zend_extensions.o: zend_extensions.c zend_extensions.h zend_compile.h \
+ zend.h config.h config.unix.h zend_errors.h zend_alloc.h zend_hash.h \
+ zend_llist.h zend-parser.h zend_globals.h zend_stack.h \
+ zend_ptr_stack.h zend_execute.h
+zend_hash.o: zend_hash.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h
+zend_list.o: zend_list.c zend.h config.h config.unix.h zend_errors.h \
+ zend_alloc.h zend_hash.h zend_llist.h zend_list.h zend_API.h \
+ modules.h zend_globals.h zend_stack.h zend_ptr_stack.h zend_compile.h \
+ zend-parser.h zend_execute.h
+zend_indent.o: zend_indent.c zend.h config.h config.unix.h \
+ zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
+ zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
+ zend_execute.h zend_indent.h
+
+# Local Variables:
+# tab-width: 4
+# End:

Zend/ZEND_CHANGES

@@ -84,7 +84,7 @@ shamelessly lying about it.  Here's why:
 
 * static variable initializers only accept scalar values
   (in PHP 3.0 they accepted any valid expression).  The impact
-  should be somewhere in between void and non existent, since
+  should be somewhere in between void and non existant, since
   initializing a static variable with anything but a simple
   static value makes no sense at all.
 
@@ -109,4 +109,3 @@ shamelessly lying about it.  Here's why:
   This incompatability is due to the full variable reference
   within quoted strings feature added in Zend.
   
-

Zend/Zend.dsp

@@ -1,494 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Zend" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=Zend - Win32 Release_inline
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Zend.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Zend.mak" CFG="Zend - Win32 Release_inline"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Zend - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "Zend - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "Zend - Win32 Release_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Zend - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40d /d "NDebug"
-# ADD RSC /l 0x40d /d "NDebug"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug" /D "_LIB" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40d /d "_Debug"
-# ADD RSC /l 0x40d /d "_Debug"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "Zend___Win32_Release_inline"
-# PROP BASE Intermediate_Dir "Zend___Win32_Release_inline"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Release_inline"
-# PROP Intermediate_Dir "Release_inline"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D ZEND_DEBUG=0 /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "WIN32" /D "_MBCS" /FR /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug" /D "_LIB" /D "Zend_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40d /d "NDebug"
-# ADD RSC /l 0x40d /d "NDebug"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Zend - Win32 Release"
-# Name "Zend - Win32 Debug"
-# Name "Zend - Win32 Release_inline"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\zend.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_alloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_API.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_builtin_functions.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_compile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_constants.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute_API.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_extensions.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_highlight.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_indent.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_parser.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_scanner.c
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_llist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_opcode.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_operators.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ptr_stack.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_sprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_stack.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_variables.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\FlexLexer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_modules.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_API.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_builtin_functions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_compile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_config.w32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_constants.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_errors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_extensions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_fast_cache.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_globals.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_highlight.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_indent.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_list.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_llist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_operators.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ptr_stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_variables.h
-# End Source File
-# End Group
-# Begin Group "Parsers"
-
-# PROP Default_Filter "y"
-# Begin Source File
-
-SOURCE=.\zend_ini_parser.y
-
-!IF  "$(CFG)" == "Zend - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
-
-# Begin Custom Build
-InputDir=.
-InputPath=.\zend_ini_parser.y
-
-BuildCmds= \
-	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y \
-	
-
-"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.y"
-
-!IF  "$(CFG)" == "Zend - Win32 Release"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Scanners"
-
-# PROP Default_Filter "l"
-# Begin Source File
-
-SOURCE=.\zend_ini_scanner.l
-
-!IF  "$(CFG)" == "Zend - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\zend_ini_scanner.l
-
-"zend_ini_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.c zend_ini_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.l"
-
-!IF  "$(CFG)" == "Zend - Win32 Release"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Debug"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Zend - Win32 Release_inline"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -i -Pzend -ozend_language_scanner.c zend_language_scanner.l
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Text Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ZEND_BUGS
-# End Source File
-# Begin Source File
-
-SOURCE=.\ZEND_CHANGES
-# End Source File
-# Begin Source File
-
-SOURCE=.\ZEND_TODO
-# End Source File
-# End Group
-# Begin Group "Resources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zend.ico
-# End Source File
-# End Group
-# End Target
-# End Project

Zend/Zend.m4

@@ -1,222 +0,0 @@
-
-AC_DEFUN(LIBZEND_BISON_CHECK,[
-
-if test "$YACC" != "bison -y"; then
-    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
-else
-    AC_MSG_CHECKING(bison version)
-    set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'`
-    if test "${1}" = "1" -a "${2}" -lt "28"; then
-        AC_MSG_WARN(You will need bison 1.28 if you want to regenerate the Zend parser (found ${1}.${2}).)
-    fi
-    AC_MSG_RESULT(${1}.${2} (ok))
-fi
-
-])
-
-AC_DEFUN(LIBZEND_BASIC_CHECKS,[
-
-AC_REQUIRE([AC_PROG_YACC])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_CC_C_O])
-AC_REQUIRE([AC_PROG_LEX])
-AC_REQUIRE([AC_HEADER_STDC])
-
-LIBZEND_BISON_CHECK
-
-dnl Ugly hack to get around a problem with gcc on AIX.
-if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
-   "`uname -sv`" = "AIX 4"; then
-	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
-fi
-
-dnl Hack to work around a Mac OS X cpp problem
-dnl Known versions needing this workaround are 5.3 and 5.4
-if test "$ac_cv_prog_gcc" = "yes" -a "`uname -s`" = "Rhapsody"; then
-        CPPFLAGS="$CPPFLAGS -traditional-cpp"
-fi
-
-AC_CHECK_HEADERS(
-limits.h \
-malloc.h \
-string.h \
-unistd.h \
-stdarg.h \
-sys/types.h \
-signal.h \
-unix.h \
-dlfcn.h)
-
-AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
-
-AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
-AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
-
-dnl This is required for QNX and may be some BSD derived systems
-AC_CHECK_TYPE( uint, unsigned int )
-AC_CHECK_TYPE( ulong, unsigned long )
-
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-AC_FUNC_MEMCMP
-AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
-AC_ZEND_BROKEN_SPRINTF
-
-AC_CHECK_FUNCS(finite isfinite isinf isnan)
-
-ZEND_FP_EXCEPT
-	
-AC_SUBST(ZEND_SCANNER)
-
-])
-
-
-
-
-
-AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
-
-AC_ARG_ENABLE(debug,
-[  --enable-debug         Compile with debugging symbols],[
-  ZEND_DEBUG=$enableval
-],[
-  ZEND_DEBUG=no
-])  
-
-])
-
-
-
-
-
-
-
-
-
-
-
-
-AC_DEFUN(LIBZEND_OTHER_CHECKS,[
-
-AC_ARG_ENABLE(experimental-zts,
-[  --enable-experimental-zts   This will most likely break your build],[
-  ZEND_EXPERIMENTAL_ZTS=$enableval
-],[
-  ZEND_EXPERIMENTAL_ZTS=no
-])  
-
-AC_ARG_ENABLE(inline-optimization,
-[  --enable-inline-optimization   If you have much memory and are using
-                                 gcc, you might try this.],[
-  ZEND_INLINE_OPTIMIZATION=$enableval
-],[
-  ZEND_INLINE_OPTIMIZATION=no
-])
-
-AC_ARG_ENABLE(memory-limit,
-[  --enable-memory-limit   Compile with memory limit support. ], [
-  ZEND_MEMORY_LIMIT=$enableval
-],[
-  ZEND_MEMORY_LIMIT=no
-])
-
-AC_MSG_CHECKING(whether to enable experimental ZTS)
-AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
-
-AC_MSG_CHECKING(whether to enable inline optimization for GCC)
-AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
-
-AC_MSG_CHECKING(whether to enable a memory limit)
-AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
-
-AC_MSG_CHECKING(whether to enable Zend debugging)
-AC_MSG_RESULT($ZEND_DEBUG)
-	
-if test "$ZEND_DEBUG" = "yes"; then
-  AC_DEFINE(ZEND_DEBUG,1,[ ])
-  echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
-  if test "$CFLAGS" = "-g -O2"; then
-  	CFLAGS=-g
-  fi
-  test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
-  test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
-else
-  AC_DEFINE(ZEND_DEBUG,0,[ ])
-fi
-
-test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
-
-if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
-  AC_DEFINE(ZTS,1,[ ])
-  ZEND_SCANNER_TYPE=cc
-  CPPFLAGS="$CPPFLAGS -I../TSRM"
-  LIBZEND_CPLUSPLUS_CHECKS
-else
-  ZEND_SCANNER_TYPE=c
-fi  
-
-ZEND_SCANNER="libZend_${ZEND_SCANNER_TYPE}.la"
-
-if test "$ZEND_MEMORY_LIMIT" = "yes"; then
-  AC_DEFINE(MEMORY_LIMIT, 1, [Memory limit])
-else
-  AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
-fi
-
-changequote({,})
-if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
-  INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//`
-else
-  INLINE_CFLAGS="$CFLAGS"
-fi
-changequote([,])
-
-AC_C_INLINE
-
-AC_SUBST(INLINE_CFLAGS)
-
-])
-
-
-AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
-
-dnl extra check to avoid C++ preprocessor testing if in non-ZTS mode
-		
-if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
-AC_PROG_CXX		
-AC_PROG_CXXCPP
-AC_LANG_CPLUSPLUS
-AC_CHECK_HEADER(stdiostream.h, [ AC_DEFINE(HAVE_STDIOSTREAM_H, [], Whether you have stdiostream.h) ])
-
-AC_CHECK_LIB(C, cin)
-AC_CHECK_LIB(g++, cin)
-AC_CHECK_LIB(stdc++, cin)
-dnl Digital Unix 4.0
-AC_CHECK_LIB(cxx, cin)
-AC_CHECK_LIB(cxxstd, __array_delete)
-
-AC_CACHE_CHECK(for class istdiostream,ac_cv_class_istdiostream,[
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <unistd.h>
-#include <fstream.h>
-#include <stdiostream.h>
-],[
-istdiostream *foo = new istdiostream((FILE *) 0);
-],[
-  ac_cv_class_istdiostream=yes
-],[
-  ac_cv_class_istdiostream=no
-])
-])
-  if test "$ac_cv_class_istdiostream" = "yes"; then
-    AC_DEFINE(HAVE_CLASS_ISTDIOSTREAM, 1, [Whether you have class istdiostream])
-  fi
-AC_LANG_C
-fi
-])
-

Zend/ZendCore.dep

@@ -4,7 +4,7 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
 	".\zend_ptr_stack.h"\
@@ -17,7 +17,7 @@
 
 .\alloca.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
 	".\zend_hash.h"\
@@ -27,10 +27,10 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
-	".\zend_modules.h"\
+	".\modules.h"\
 	".\zend_operators.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
@@ -46,7 +46,7 @@
 .\zend_constants.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_constants.h"\
 	".\zend_operators.h"\
 	".\zend_variables.h"\
@@ -59,11 +59,11 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_constants.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
-	".\zend_modules.h"\
+	".\modules.h"\
 	".\zend_operators.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
@@ -80,13 +80,13 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_execute.h"\
 	".\zend_highlight.h"\
 	".\zend_llist.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
-	".\zend_language_parser.tab.h"\
+	".\zend-parser.tab.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
 	".\zend_globals.h"\
@@ -96,7 +96,7 @@
 .\zend_llist.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_llist.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
@@ -107,10 +107,10 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
-	".\zend_modules.h"\
+	".\modules.h"\
 	".\zend_operators.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
@@ -127,7 +127,7 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
 	".\zend_operators.h"\
@@ -143,7 +143,7 @@
 .\zend_ptr_stack.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_ptr_stack.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
@@ -153,7 +153,7 @@
 .\zend_stack.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_stack.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
@@ -164,11 +164,11 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_constants.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
-	".\zend_modules.h"\
+	".\modules.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
 	".\zend_variables.h"\
@@ -184,7 +184,7 @@
 .\zend.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_operators.h"\
 	".\zend_variables.h"\
 	".\zend.h"\
@@ -196,11 +196,11 @@
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
 	".\zend_compile.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend_constants.h"\
 	".\zend_execute.h"\
 	".\zend_llist.h"\
-	".\zend_modules.h"\
+	".\modules.h"\
 	".\zend_operators.h"\
 	".\zend_ptr_stack.h"\
 	".\zend_stack.h"\
@@ -216,7 +216,7 @@
 
 .\zend_hash.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
 	".\zend_hash.h"\
@@ -225,7 +225,7 @@
 .\zend_ini.c : \
 	"..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\zend_alloc.h"\
-	".\zend_config.w32.h"\
+	".\config.w32.h"\
 	".\zend.h"\
 	".\zend_errors.h"\
 	".\zend_hash.h"\

Zend/ZendTS.dsp

@@ -1,645 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ZendTS" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=ZendTS - Win32 Release_TSDbg
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "ZendTS.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "ZendTS.mak" CFG="ZendTS - Win32 Release_TSDbg"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "ZendTS - Win32 Release_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "ZendTS - Win32 Debug_TS" (based on "Win32 (x86) Static Library")
-!MESSAGE "ZendTS - Win32 Release_TS_inline" (based on "Win32 (x86) Static Library")
-!MESSAGE "ZendTS - Win32 Release_TSDbg" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "Release_TS"
-# PROP BASE Intermediate_Dir "Release_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Release_TS"
-# PROP Intermediate_Dir "Release_TS"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDebug_TS" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40d /d "NDebug_TS"
-# ADD RSC /l 0x40d /d "NDebug_TS"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "Debug_TS"
-# PROP BASE Intermediate_Dir "Debug_TS"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Debug_TS"
-# PROP Intermediate_Dir "Debug_TS"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_Debug_TS" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40d /d "_Debug_TS"
-# ADD RSC /l 0x40d /d "_Debug_TS"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "ZendTS___Win32_Release_TS_inline"
-# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TS_inline"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Release_TS_inline"
-# PROP Intermediate_Dir "Release_TS_inline"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40d /d "NDebug_TS"
-# ADD RSC /l 0x40d /d "NDebug_TS"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Output_Dir "ZendTS___Win32_Release_TSDbg"
-# PROP BASE Intermediate_Dir "ZendTS___Win32_Release_TSDbg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Output_Dir "Release_TSDbg"
-# PROP Intermediate_Dir "Release_TSDbg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "." /D "NDebug_TS" /D ZEND_DEBUG=0 /D _WIN32_WINNT=0x400 /D "_LIB" /D "TSRM_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x40d /d "NDebug_TS"
-# ADD RSC /l 0x40d /d "NDebug_TS"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "ZendTS - Win32 Release_TS"
-# Name "ZendTS - Win32 Debug_TS"
-# Name "ZendTS - Win32 Release_TS_inline"
-# Name "ZendTS - Win32 Release_TSDbg"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\zend.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_alloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_API.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_builtin_functions.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_compile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_constants.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_dynamic_array.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute_API.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_extensions.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_highlight.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_indent.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_parser.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_scanner.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.c"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_list.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_llist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_opcode.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_operators.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ptr_stack.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_sprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_stack.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_variables.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\FlexLexer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_modules.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_API.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_builtin_functions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_compile.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_config.w32.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_constants.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_dynamic_array.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_errors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_execute_locks.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_extensions.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_fast_cache.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_globals.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_globals_macros.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_highlight.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_indent.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_parser.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ini_scanner.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_istdiostream.h
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.h"
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_list.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_llist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_operators.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_ptr_stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_stack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\zend_variables.h
-# End Source File
-# End Group
-# Begin Group "Parsers"
-
-# PROP Default_Filter "y"
-# Begin Source File
-
-SOURCE=.\zend_ini_parser.y
-
-!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
-
-# Begin Custom Build
-InputDir=.
-InputPath=.\zend_ini_parser.y
-
-BuildCmds= \
-	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y \
-	
-
-"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
-
-# Begin Custom Build
-InputDir=.
-InputPath=.\zend_ini_parser.y
-
-BuildCmds= \
-	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y \
-	
-
-"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
-
-# Begin Custom Build
-InputDir=.
-InputPath=.\zend_ini_parser.y
-
-BuildCmds= \
-	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y \
-	
-
-"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
-
-# Begin Custom Build
-InputDir=.
-InputPath=.\zend_ini_parser.y
-
-BuildCmds= \
-	bison --output=zend_ini_parser.c -v -d -p ini_ zend_ini_parser.y
-
-"$(InputDir)\zend_ini_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_ini_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_parser.y"
-
-!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y \
-	
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
-
-# Begin Custom Build
-InputDir=.
-InputPath=".\zend_language_parser.y"
-
-BuildCmds= \
-	bison --output=zend_language_parser.c -v -d -p zend zend_language_parser.y
-
-"$(InputDir)\zend_language_parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputDir)\zend_language_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Scanners"
-
-# PROP Default_Filter "l"
-# Begin Source File
-
-SOURCE=.\zend_ini_scanner.l
-
-!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
-
-# Begin Custom Build
-InputPath=.\zend_ini_scanner.l
-
-"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
-
-# Begin Custom Build
-InputPath=.\zend_ini_scanner.l
-
-"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
-
-# Begin Custom Build
-InputPath=.\zend_ini_scanner.l
-
-"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
-
-# Begin Custom Build
-InputPath=.\zend_ini_scanner.l
-
-"zend_ini_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pini_ -ozend_ini_scanner.cpp zend_ini_scanner.l
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=".\zend_language_scanner.l"
-
-!IF  "$(CFG)" == "ZendTS - Win32 Release_TS"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Debug_TS"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TS_inline"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ZendTS - Win32 Release_TSDbg"
-
-# Begin Custom Build
-InputPath=".\zend_language_scanner.l"
-
-"zend_language_scanner.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	flex -+ -B -i -Sflex.skl -Pzend -ozend_language_scanner.cpp zend_language_scanner.l
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Text Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\LICENSE
-# End Source File
-# Begin Source File
-
-SOURCE=.\ZEND_BUGS
-# End Source File
-# Begin Source File
-
-SOURCE=.\ZEND_CHANGES
-# End Source File
-# End Group
-# Begin Group "Resources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\zend.ico
-# End Source File
-# End Group
-# End Target
-# End Project

Zend/acconfig.h

@@ -1,76 +1,247 @@
-#define ZEND_API
-#define ZEND_DLEXPORT
-
-@TOP@
+/* This is the default configuration file to read */
+#define USE_CONFIG_FILE 1
 
+/* define uint by configure if it is missed (QNX and BSD derived) */
 #undef uint
+
+/* define ulong by configure if it is missed (most probably is) */
 #undef ulong
 
+/* type check for in_addr_t */
+#undef in_addr_t
+
+/* Solaris YP check */
+#undef SOLARIS_YP
+
+/* Netscape LDAP SDK check */
+#undef HAVE_NSLDAP
+
+/* ImageMagick check */
+#undef HAVE_LIBMAGICK
+
+/* Define if you have dirent.h but opendir() resides in libc rather than in libdir */
+/* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */
+#define HAVE_DIRENT_H 0
+
+/* Define if you have struct flock */
+#define HAVE_STRUCT_FLOCK 0
+
+/* Define if you have the resolv library (-lresolv). */
+#define HAVE_LIBRESOLV 0
+
+/* Define if you have the gd library (-lgd). */
+#define HAVE_LIBGD 0
+
+/* Define if you have the GNU gettext library (-lintl). */
+#define HAVE_LIBINTL 0
+
+/* Define if you have the zlib library */
+#define HAVE_ZLIB 0
+
+/* Define if you have the gd version 1.3 library (-lgd). */
+#define HAVE_LIBGD13 0
+
+/* Undefine if you want stricter XML/SGML compliance by default */
+/* (this disables "<?expression?>" by default) */
+#define DEFAULT_SHORT_OPEN_TAG 1
+
+/* Define if you want the logging to go to ndbm/gdbm/flatfile */
+#define LOG_DBM 0
+#define LOG_DBM_DIR "."
+
+/* Define if you want the logging to go to a mysql database */
+#define LOG_MYSQL 0
+
+/* Define if you want the logging to go to a mysql database */
+#define LOG_MSQL 0
+
+/* Define these if you are using an SQL database for logging */
+#define LOG_SQL_HOST ""
+#define LOG_SQL_DB ""
+
+/* Define if you an ndbm compatible library (-ldbm).  */
+#define NDBM 0
+
+/* Define if you have the gdbm library (-lgdbm).  */
+#define GDBM 0
+
+/* Define both of these if you want the bundled REGEX library */
+#define REGEX 0
+#define HSREGEX 0
+
+/* Define if you want Solid database support */
+#define HAVE_SOLID 0
+
+/* Define if you want to use the supplied dbase library */
+#define DBASE 0
+
+/* Define if you want Hyperwave support */
+#define HYPERWAVE 0
+
+/* Define if you have the crypt() function */
+#define HAVE_CRYPT 1
+
+/* Define if you have the Oracle database client libraries */
+#define HAVE_ORACLE 0
+
+/* Define if you have the Oracle version 8 database client libraries */
+#define HAVE_OCI8 0
+
+/* Define if you want to use the iODBC database driver */
+#define HAVE_IODBC 0
+
+/* Define if you want to use the OpenLink ODBC database driver */
+#define HAVE_OPENLINK 0
+
+/* Define if you have the AdabasD client libraries */
+#define HAVE_ADABAS 0
+
+/* Define if you want the LDAP directory interface */
+#define HAVE_LDAP 0
+
+/* Define if you want the Cybercash MCK support */
+#define HAVE_MCK 0
+
+/* Define if you want the SNMP interface */
+#define HAVE_SNMP 0
+
+/* Define if you want the IMAP directory interface */
+#define HAVE_IMAP 0
+
+/* Define if you want the ASPELL interface */
+#define HAVE_ASPELL 0
+
+/* Define if you want to use a custom ODBC database driver */
+#define HAVE_CODBC 0
+
+/* Define to use the unified ODBC interface */
+#define HAVE_UODBC 0
+
+/* Define if you have libdl (used for dynamic linking) */
+#define HAVE_LIBDL 0
+
+/* Define if you have libdnet_stub (used for Sybase support) */
+#define HAVE_LIBDNET_STUB 0
+
+/* Define if you have and want to use libcrypt */
+#define HAVE_LIBCRYPT 0
+
+/* Define if you have and want to use libnsl */
+#define HAVE_LIBNSL 0
+
+/* Define if you have and want to use libsocket */
+#define HAVE_LIBSOCKET 0
+
+/* Define if you have and want to use libpam */
+#define HAVE_LIBPAM 0
+
+/* Define if you have the sendmail program available */
+#define HAVE_SENDMAIL 0
+
+/* Define if your Apache creates an ap_config.h header file (only 1.3b6 and later) */
+#define HAVE_AP_CONFIG_H 0
+
+/* Define if your Apache has src/include/compat.h */
+#define HAVE_OLD_COMPAT_H 0
+
+/* Define if your Apache has src/include/ap_compat.h */
+#define HAVE_AP_COMPAT_H 0
+
+#ifndef HAVE_EMPRESS
+#define HAVE_EMPRESS 0
+#endif
+
+#define HAVE_SYBASE 0
+#define HAVE_SYBASE_CT 0
+
+#ifndef HAVE_MYSQL
+#define HAVE_MYSQL 0
+#endif
+
+#ifndef HAVE_MSQL
+#define HAVE_MSQL 0
+#endif
+
+#ifndef HAVE_PGSQL
+#define HAVE_PGSQL 0
+#endif
+
+#ifndef HAVE_VELOCIS
+#define HAVE_VELOCIS 0
+#endif
+
+#ifndef HAVE_IFX
+#define HAVE_IFX 0
+#endif
+#ifndef HAVE_IFX_IUS
+#define HAVE_IFX_IUS 0
+#endif
+#ifndef IFX_VERSION
+#define IFX_VERSION 0
+#endif
+
+#ifndef HAVE_IBASE
+#define HAVE_IBASE 0
+#endif
+
+#ifndef HAVE_PQCMDTUPLES
+#define HAVE_PQCMDTUPLES 0
+#endif
+
+#undef ZEND_DEBUG
+
+/* Define if your system has the gettimeofday() call */
+#define HAVE_GETTIMEOFDAY 0
+
+/* Define if your system has the getrusage() call */
+#define HAVE_GETRUSAGE 0
+
+/* Define if your system has the putenv() library call */
+#define HAVE_PUTENV 0
+
+/* Define if you want to enable bc style precision math support */
+#define WITH_BCMATH 0
+
+/* Define if you want to prevent the CGI from working unless REDIRECT_STATUS is defined in the environment */
+#define FORCE_CGI_REDIRECT 0
+
+/* Define if you want to prevent the CGI from using path_info and path_translated */
+#define DISCARD_PATH 0
+
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
-@BOTTOM@
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include <ieeefp.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include <math.h>
-
-#ifdef HAVE_ISNAN
-#define zend_isnan(a) isnan(a)
-#elif defined(NAN)
-#define zend_isnan(a) (((a)==NAN)?1:0)
-#elif defined(HAVE_FPCLASS)
-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
-#else
-#define zend_isnan(a) 0
-#endif
-
-#ifdef HAVE_ISINF
-#define zend_isinf(a) isinf(a)
-#elif defined(INFINITY)
-/* Might not work, but is required by ISO C99 */
-#define zend_isinf(a) (((a)==INFINITY)?1:0)
-#elif defined(HAVE_FPCLASS)
-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
-#else
-#define zend_isinf(a) 0
-#endif
-
-#ifdef HAVE_FINITE
-#define zend_finite(a) finite(a)
-#elif defined(HAVE_ISFINITE) || defined(isfinite)
-#define zend_finite(a) isfinite(a)
-#elif defined(fpclassify)
-#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0)
-#else
-#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1)
-#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
+/* Define if you want System V semaphore support.
  */
+#define HAVE_SYSVSEM 0
+
+/* Define if you have union semun.
+ */
+#define HAVE_SEMUN 0
+
+/* Define if you want System V shared memory support.  */
+#define HAVE_SYSVSHM 0
+
+/* Define if you want to enable displaying source support. */
+#define HAVE_DISPLAY_SOURCE 0
+
+/* Define if you have broken header files like SunOS 4 */
+#define MISSING_FCLOSE_DECL 0
+
+/* Define if you have broken sprintf function like SunOS 4 */
+#define BROKEN_SPRINTF 0
+
+/* Define if you have the expat (XML Parser Toolkit) library */
+#define HAVE_LIBEXPAT 0
+
+/* Define if you have the pdflib library */
+#define HAVE_PDFLIB 0
+
+/* Define if you have the fdftk library */
+#define HAVE_FDFLIB 0
+
+/* Define to compile with mod_dav support */
+#define HAVE_MOD_DAV 0
+
+/* Define to enable yp/nis support */
+#define HAVE_YP 0

Zend/acinclude.m4

@@ -1,47 +0,0 @@
-dnl $Id$
-dnl
-dnl This file contains local autoconf functions.
-
-AC_DEFUN(ZEND_FP_EXCEPT,[
-  AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
-    AC_TRY_COMPILE([
-#include <floatingpoint.h>
-],[
-fp_except x = (fp_except) 0;
-],[
-     ac_cv_type_fp_except=yes
-],[
-     ac_cv_type_fp_except=no
-],[
-     ac_cv_type_fp_except=no
-])])
-  if test "$ac_cv_type_fp_except" = "yes"; then
-    AC_DEFINE(HAVE_FP_EXCEPT, 1, [whether floatingpoint.h defines fp_except])
-  fi
-])
-
-dnl
-dnl Check for broken sprintf()
-dnl
-AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
-  AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
-    AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
-      ac_cv_broken_sprintf=no
-    ],[
-      ac_cv_broken_sprintf=yes
-    ],[
-      ac_cv_broken_sprintf=no
-    ])
-  ])
-  if test "$ac_cv_broken_sprintf" = "yes"; then
-    ac_result=1
-  else
-    ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
-])
-
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
-  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
-])
-

Zend/aclocal.m4

@@ -0,0 +1,52 @@
+dnl $Id$
+dnl
+dnl This file contains local autoconf functions.
+
+dnl
+dnl Check for broken sprintf()
+dnl
+AC_DEFUN(AC_BROKEN_SPRINTF,[
+  AC_MSG_CHECKING([for broken sprintf])
+  AC_TRY_RUN([main() { char buf[20]; exit (sprintf(buf,"testing 123")!=11); }],[
+    AC_DEFINE(BROKEN_SPRINTF,0)
+    AC_MSG_RESULT(ok)
+  ],[
+    AC_DEFINE(BROKEN_SPRINTF,1)
+    AC_MSG_RESULT(broken)
+  ],[
+    AC_DEFINE(BROKEN_SPRINTF,0)
+    AC_MSG_RESULT(cannot check, guessing ok)
+  ])
+])
+# another one stolen from automake temporarily
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "$@" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])

Zend/build.mk

@@ -1,43 +0,0 @@
-# Makefile to generate build tools
-#
-# Standard usage:
-#        make -f build.mk
-#
-# Written by Sascha Schumann
-#
-# $Id$ 
-
-
-LT_TARGETS = ltmain.sh ltconfig
-
-config_h_in = zend_config.h.in
-
-makefile_am_files = Makefile.am
-makefile_in_files = $(makefile_am_files:.am=.in)
-makefile_files    = $(makefile_am_files:e.am=e)
-
-targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in)
-
-all: $(targets)
-
-clean:
-	rm -f $(targets)
-
-$(LT_TARGETS):
-	rm -f $(LT_TARGETS)
-	libtoolize --automake $(AMFLAGS) -f
-
-$(makefile_in_files): $(makefile_am_files)
-	automake -a -i $(AMFLAGS) $(makefile_files)
-
-aclocal.m4: configure.in acinclude.m4
-	aclocal
-
-$(config_h_in): configure.in acconfig.h
-# explicitly remove target since autoheader does not seem to work 
-# correctly otherwise (timestamps are not updated)
-	@rm -f $@
-	autoheader
-
-configure: aclocal.m4 configure.in
-	autoconf

Zend/buildconf

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-case "$1" in
---copy)
-	automake_flags=--copy
-	shift
-;;
-esac
-
-libtoolize --force --automake $automake_flags
-
-mv aclocal.m4 aclocal.m4.old 2>/dev/null
-aclocal
-if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}aclocal.m4"
-    mv aclocal.m4.old aclocal.m4
-else
-    echo "buildconf: created or modified ${1}aclocal.m4"
-fi
-
-autoheader
-
-automake --add-missing --include-deps $automake_flags
-
-mv configure configure.old 2>/dev/null
-autoconf
-if cmp configure.old configure > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}configure"
-    mv configure.old configure
-else
-    echo "buildconf: created or modified ${1}configure"
-fi
-

Zend/config.h.in

@@ -0,0 +1,274 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
+/* Define if utime(file, NULL) sets file's timestamp to the present.  */
+#undef HAVE_UTIME_NULL
+
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
+
+/* Define if your C compiler doesn't accept -c and -o together.  */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* define uint by configure if it is missed (QNX and BSD derived) */
+#undef uint
+
+/* define ulong by configure if it is missed (most probably is) */
+#undef ulong
+
+/* Define if you have the resolv library (-lresolv). */
+#define HAVE_LIBRESOLV 0
+
+/* Define if you have libdl (used for dynamic linking) */
+#define HAVE_LIBDL 0
+
+/* Define if you have and want to use libnsl */
+#define HAVE_LIBNSL 0
+
+/* Define if you have and want to use libsocket */
+#define HAVE_LIBSOCKET 0
+
+#undef ZEND_DEBUG
+
+/* Define if you want to enable memory limit support */
+#define MEMORY_LIMIT 0
+
+/* Define if you have broken sprintf function like SunOS 4 */
+#define BROKEN_SPRINTF 0
+
+/* Define if you have the crypt function.  */
+#undef HAVE_CRYPT
+
+/* Define if you have the cuserid function.  */
+#undef HAVE_CUSERID
+
+/* Define if you have the flock function.  */
+#undef HAVE_FLOCK
+
+/* Define if you have the gcvt function.  */
+#undef HAVE_GCVT
+
+/* Define if you have the getlogin function.  */
+#undef HAVE_GETLOGIN
+
+/* Define if you have the getopt function.  */
+#undef HAVE_GETOPT
+
+/* Define if you have the gettimeofday function.  */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define if you have the inet_aton function.  */
+#undef HAVE_INET_ATON
+
+/* Define if you have the link function.  */
+#undef HAVE_LINK
+
+/* Define if you have the lockf function.  */
+#undef HAVE_LOCKF
+
+/* Define if you have the lrand48 function.  */
+#undef HAVE_LRAND48
+
+/* Define if you have the memcpy function.  */
+#undef HAVE_MEMCPY
+
+/* Define if you have the memmove function.  */
+#undef HAVE_MEMMOVE
+
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the random function.  */
+#undef HAVE_RANDOM
+
+/* Define if you have the regcomp function.  */
+#undef HAVE_REGCOMP
+
+/* Define if you have the rint function.  */
+#undef HAVE_RINT
+
+/* Define if you have the setitimer function.  */
+#undef HAVE_SETITIMER
+
+/* Define if you have the setlocale function.  */
+#undef HAVE_SETLOCALE
+
+/* Define if you have the setsockopt function.  */
+#undef HAVE_SETSOCKOPT
+
+/* Define if you have the setvbuf function.  */
+#undef HAVE_SETVBUF
+
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the srand48 function.  */
+#undef HAVE_SRAND48
+
+/* Define if you have the srandom function.  */
+#undef HAVE_SRANDOM
+
+/* Define if you have the statfs function.  */
+#undef HAVE_STATFS
+
+/* Define if you have the statvfs function.  */
+#undef HAVE_STATVFS
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
+
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
+
+/* Define if you have the strstr function.  */
+#undef HAVE_STRSTR
+
+/* Define if you have the symlink function.  */
+#undef HAVE_SYMLINK
+
+/* Define if you have the tempnam function.  */
+#undef HAVE_TEMPNAM
+
+/* Define if you have the tzset function.  */
+#undef HAVE_TZSET
+
+/* Define if you have the unsetenv function.  */
+#undef HAVE_UNSETENV
+
+/* Define if you have the usleep function.  */
+#undef HAVE_USLEEP
+
+/* Define if you have the utime function.  */
+#undef HAVE_UTIME
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
+/* Define if you have the <crypt.h> header file.  */
+#undef HAVE_CRYPT_H
+
+/* Define if you have the <db.h> header file.  */
+#undef HAVE_DB_H
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <dlfcn.h> header file.  */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the <grp.h> header file.  */
+#undef HAVE_GRP_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the <ndbm.h> header file.  */
+#undef HAVE_NDBM_H
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <netinet/in.h> header file.  */
+#undef HAVE_NETINET_IN_H
+
+/* Define if you have the <pwd.h> header file.  */
+#undef HAVE_PWD_H
+
+/* Define if you have the <signal.h> header file.  */
+#undef HAVE_SIGNAL_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#undef HAVE_STDARG_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/file.h> header file.  */
+#undef HAVE_SYS_FILE_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/statfs.h> header file.  */
+#undef HAVE_SYS_STATFS_H
+
+/* Define if you have the <sys/statvfs.h> header file.  */
+#undef HAVE_SYS_STATVFS_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <sys/varargs.h> header file.  */
+#undef HAVE_SYS_VARARGS_H
+
+/* Define if you have the <sys/wait.h> header file.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define if you have the <syslog.h> header file.  */
+#undef HAVE_SYSLOG_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <unix.h> header file.  */
+#undef HAVE_UNIX_H
+
+/* Define if you have the m library (-lm).  */
+#undef HAVE_LIBM
+
+/* Define if you have the resolv library (-lresolv).  */
+#undef HAVE_LIBRESOLV

Zend/config.unix.h

@@ -0,0 +1,39 @@
+#ifndef _CONFIG_UNIX_H
+#define _CONFIG_UNIX_H
+
+#define ZEND_API
+
+#include <stdlib.h>
+
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#if HAVE_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
+#if HAVE_LIBDL
+#	include <dlfcn.h>
+#	define DL_LOAD(libname)	dlopen(libname, RTLD_NOW)
+#	define DL_UNLOAD		dlclose
+#	define DL_FETCH_SYMBOL	dlsym
+#	define DL_HANDLE		void *
+#	define ZEND_EXTENSIONS_SUPPORT 1
+#else
+#	define ZEND_EXTENSIONS_SUPPORT 0
+#endif
+
+#if BROKEN_SPRINTF
+int zend_sprintf(char *buffer, const char *format, ...);
+#else
+#	define zend_sprintf sprintf
+#endif
+
+#if ZEND_DEBUG
+#	define inline
+#endif
+
+#endif /* _CONFIG_UNIX_H */

Zend/config.w32.h

@@ -0,0 +1,41 @@
+#ifndef _ZEND_CONFIG_W32_H
+#define _ZEND_CONFIG_W32_H
+
+
+#include <string.h>
+#include <windows.h>
+
+typedef unsigned long ulong;
+typedef unsigned int uint;
+
+#define HAVE_ALLOCA 1
+#include <malloc.h>
+
+#define HAVE_DIRENT_H 0
+
+#ifdef inline
+#undef inline
+#endif
+
+#define ZEND_DEBUG 1
+
+#define zend_sprintf sprintf
+
+/* Visual C++ doesn't really work with inline for C */
+#define inline
+
+
+#define DL_LOAD(libname)	LoadLibrary(libname)
+#define DL_FETCH_SYMBOL		GetProcAddress
+#define DL_UNLOAD			FreeLibrary
+#define DL_HANDLE			HMODULE
+#define ZEND_EXTENSIONS_SUPPORT 1
+
+#ifdef COMPILE_LIBZEND
+#	define ZEND_API __declspec(dllexport)
+#else
+#	define ZEND_API __declspec(dllimport)
+#endif
+
+
+#endif /* _ZEND_CONFIG_W32_H */

Zend/configure.in

@@ -2,25 +2,63 @@ dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(zend.c)
-AM_INIT_AUTOMAKE(zend, 0.80A, nodefine)
-AM_CONFIG_HEADER(zend_config.h)
+
+AC_CONFIG_HEADER(config.h)
 AM_SANITY_CHECK
-AM_MAINTAINER_MODE
-AC_PROG_CC
-AM_PROG_LEX
-AM_PROG_CC_STDC
-ZEND_VERSION=$VERSION
 
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
-sinclude(Zend.m4)
+dnl Checks for programs.
+AC_PROG_YACC
+if test "$YACC" != "bison -y"; then
+    AC_MSG_WARN(You will need bison if you'd want to regenerate the PHP 3.0 parsers.)
+else
+    AC_MSG_CHECKING(bison version)
+    set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'`
+    if test "$1" = "1" -a "$2" -lt "25"; then
+        AC_MSG_WARN(You will need bison 1.25 if you'd want to regenerate the PHP 3.0 parsers (found $1.$2).)
+    fi
+    AC_MSG_RESULT($1.$2 (ok))
+fi
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_PROG_CC_C_O
+AC_PATH_PROG(PERL_PATH, perl)
 
-LIBZEND_BASIC_CHECKS
+dnl Ugly hack to get around a problem with gcc on AIX.
+if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
+   "`uname -sv`" = "AIX 4"; then
+	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
+fi
 
-AM_PROG_LIBTOOL
-if test "$enable_debug" != "yes"; then
-  AM_SET_LIBTOOL_VARIABLE([--silent])
+dnl check for -R, etc. switch
+AC_MSG_CHECKING(if compiler supports -R)
+AC_CACHE_VAL(php_cv_cc_dashr,[
+	SAVE_LIBS="${LIBS}"
+	LIBS="-R /usr/lib ${LIBS}"
+	AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
+	LIBS="${SAVE_LIBS}"])
+AC_MSG_RESULT($php_cv_cc_dashr)
+if test $php_cv_cc_dashr = "yes"; then
+	ld_runpath_switch="-R"
+	apxs_runpath_switch="-Wl,-R'"
+else
+	AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+	AC_CACHE_VAL(php_cv_cc_rpath,[
+		SAVE_LIBS="${LIBS}"
+		LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
+		AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
+		LIBS="${SAVE_LIBS}"])
+	AC_MSG_RESULT($php_cv_cc_rpath)
+	if test $php_cv_cc_rpath = "yes"; then
+		ld_runpath_switch="-Wl,-rpath,"
+		apxs_runpath_switch="-Wl,'-rpath "
+	else
+		dnl something innocuous
+		ld_runpath_switch="-L"
+		apxs_runpath_switch="-L'"
+	fi
 fi
 
 dnl
@@ -32,13 +70,124 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
        LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 fi
 
-LIBZEND_ENABLE_DEBUG
-LIBZEND_OTHER_CHECKS
+AC_CHECK_LIB(nsl, gethostname, [
+  LIBS="-lnsl $LIBS"
+  AC_DEFINE(HAVE_LIBNSL) ], [])
+
+AC_CHECK_LIB(c, socket, [:], [
+ AC_CHECK_LIB(socket, socket, [
+  LIBS="-lsocket $LIBS"
+  AC_DEFINE(HAVE_LIBSOCKET) ], []) ])
+
+AC_CHECK_LIB(c, gethostbyaddr, [:], [
+ AC_CHECK_LIB(nsl, gethostbyaddr, [
+  LIBS="-lnsl $LIBS"
+  AC_DEFINE(HAVE_LIBNSL) ], []) ])
+
+AC_CHECK_LIB(c, dlopen, [
+ # fake it
+ AC_DEFINE(HAVE_LIBDL) ], [
+ AC_CHECK_LIB(dl, dlopen, [
+  LIBS="-ldl $LIBS"
+  AC_DEFINE(HAVE_LIBDL) ], []) ])
+
+dnl The sin may be in a library which need not be specifed
+dnl as well as res_search resides in libsocket
+AC_CHECK_LIB(c, sin, [:], [
+ AC_CHECK_LIB(m, sin) ])
+
+dnl The res_search may be in libsocket as well, and if it is
+dnl make sure to check for dn_skipname in libresolv, or if res_search
+dnl is in neither of these libs, still check for dn_skipname in libresolv
+AC_CHECK_LIB(socket, res_search, [
+ AC_CHECK_LIB(resolv, dn_skipname)
+ AC_CHECK_LIB(resolv, __dn_skipname)
+ LIBS="$LIBS -lsocket"
+ AC_DEFINE(HAVE_LIBSOCKET) 
+], [
+ AC_CHECK_LIB(resolv, res_search, [
+  LIBS="$LIBS -lresolv"
+  AC_DEFINE(HAVE_LIBRESOLV) 
+ ], [
+  AC_CHECK_LIB(resolv, dn_skipname)
+  AC_CHECK_LIB(resolv, __dn_skipname)
+ ]) 
+])
+
+dnl Checks for header files.
+AC_HEADER_STDC
+
+dnl In QNX opendir resides in libc but dirent.h is still required
+if test "`uname -s 2>/dev/null`" != "QNX"; then
+	AC_HEADER_DIRENT
+else
+	AC_CHECK_HEADERS(dirent.h)
+fi
+dnl QNX requires unix.h to allow functions in libunix to work properly
+AC_CHECK_HEADERS(fcntl.h unistd.h crypt.h sys/file.h memory.h pwd.h grp.h sys/socket.h sys/wait.h syslog.h string.h sys/varargs.h stdarg.h sys/resource.h sys/time.h signal.h netinet/in.h dlfcn.h limits.h sys/types.h sys/statvfs.h sys/statfs.h unix.h db.h ndbm.h)
+
+dnl Checks for types
+AC_TYPE_SIZE_T
+
+dnl This is required for QNX and may be some BSD derived systems
+AC_CHECK_TYPE( uint, unsigned int )
+AC_CHECK_TYPE( ulong, unsigned long )
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton)
+AC_FUNC_UTIME_NULL
+AC_FUNC_ALLOCA
+AC_BROKEN_SPRINTF
+AC_REPLACE_FUNCS(getopt)
+
+AC_MSG_CHECKING(whether to include debugging symbols)
+AC_ARG_ENABLE(debug,
+[  --enable-debug          Compile with debugging symbols],
+[
+  if test "$enableval" = "yes"; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(ZEND_DEBUG,1)
+    DEBUG_CFLAGS="-g"
+    test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
+    test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
+      DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
+  else
+    AC_MSG_RESULT(no)
+    AC_DEFINE(ZEND_DEBUG,0)
+    DEBUG_CFLAGS=""
+  fi
+],[
+  AC_MSG_RESULT(no)
+  AC_DEFINE(ZEND_DEBUG,0)
+  DEBUG_CFLAGS=""
+]) 
+AC_SUBST(DEBUG_CFLAGS)
+
+
+AC_MSG_CHECKING(whether to enable a memory limit)
+AC_ARG_ENABLE(memory-limit,
+[  --enable-memory-limit   Compile with memory limit support. ],
+[
+  if test "$enableval" = "yes"; then
+    AC_DEFINE(MEMORY_LIMIT, 1)
+    AC_MSG_RESULT(yes)
+  else
+    AC_DEFINE(MEMORY_LIMIT, 0)
+    AC_MSG_RESULT(no)
+  fi
+],[
+  AC_DEFINE(MEMORY_LIMIT, 0)
+  AC_MSG_RESULT(no)
+]) 
+
+
+AC_SUBST(CFLAGS_SHLIB)
+AC_SUBST(LDFLAGS_SHLIB)
+AC_SUBST(LDFLAGS_SHLIB_EXPORT)
+
+AC_OUTPUT(Makefile, [], [])
 
-EXTRA_LIBS="$LIBS"
-LIBS=""
-AC_SUBST(EXTRA_LIBS)
-AC_OUTPUT(Makefile)
 
 # Local Variables:
 # tab-width: 4

Zend/libzend.dsp

@@ -0,0 +1,354 @@
+# Microsoft Developer Studio Project File - Name="libzend" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libzend - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libzend.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libzend.mak" CFG="libzend - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libzend - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libzend - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libzend - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "COMPILE_LIBZEND" /YX /FD /c
+# ADD BASE RSC /l 0x40d /d "NDEBUG"
+# ADD RSC /l 0x40d /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "COMPILE_LIBZEND" /FR /YX /FD /GZ /c
+# ADD BASE RSC /l 0x40d /d "_DEBUG"
+# ADD RSC /l 0x40d /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libzend - Win32 Release"
+# Name "libzend - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=".\zend-parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend-scanner.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute_API.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_opcode.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_sprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\config.w32.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\modules.h
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend-parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE=".\zend-scanner.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_API.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_compile.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_constants.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_errors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_execute.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_extensions.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_globals.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_highlight.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_indent.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_list.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_llist.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_operators.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_ptr_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_stack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\zend_variables.h
+# End Source File
+# End Group
+# Begin Group "Parsers"
+
+# PROP Default_Filter "y"
+# Begin Source File
+
+SOURCE=".\zend-parser.y"
+
+!IF  "$(CFG)" == "libzend - Win32 Release"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend-parser.y"
+
+BuildCmds= \
+	bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y
+
+"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+
+# Begin Custom Build
+InputDir=.
+InputPath=".\zend-parser.y"
+
+BuildCmds= \
+	bison --output=zend-parser.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" -p zend zend-parser.y
+
+"$(InputDir)\zend-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputDir)\zend-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Scanners"
+
+# PROP Default_Filter "l"
+# Begin Source File
+
+SOURCE=".\zend-scanner.l"
+
+!IF  "$(CFG)" == "libzend - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libzend - Win32 Debug"
+
+# Begin Custom Build
+InputPath=".\zend-scanner.l"
+
+"zend-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -i -Pzend -ozend-scanner.c zend-scanner.l
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\ZEND_BUGS
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_CHANGES
+# End Source File
+# Begin Source File
+
+SOURCE=.\ZEND_TODO
+# End Source File
+# End Group
+# Begin Group "Resources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\zend.ico
+# End Source File
+# End Group
+# End Target
+# End Project

Zend/zend-parser.y

@@ -0,0 +1,632 @@
+%{
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
+   +----------------------------------------------------------------------+
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* 
+ * LALR shift/reduce conflicts and how they are resolved:
+ *
+ * - 2 shift/reduce conflicts due to the dangeling elseif/else ambiguity.  Solved by shift.
+ * - 1 shift/reduce conflict due to arrays within encapsulated strings. Solved by shift. 
+ * - 1 shift/reduce conflict due to objects within encapsulated strings.  Solved by shift.
+ * 
+ */
+
+#include "zend_compile.h"
+#include "zend.h"
+#include "zend_list.h"
+#include "zend_globals.h"
+#include "zend_API.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
+
+
+#define YYERROR_VERBOSE
+
+%}
+
+%pure_parser
+%expect 4
+
+%left INCLUDE EVAL
+%left ','
+%left LOGICAL_OR
+%left LOGICAL_XOR
+%left LOGICAL_AND
+%right ZEND_PRINT
+%left '=' PLUS_EQUAL MINUS_EQUAL MUL_EQUAL DIV_EQUAL CONCAT_EQUAL MOD_EQUAL AND_EQUAL OR_EQUAL XOR_EQUAL SHIFT_LEFT_EQUAL SHIFT_RIGHT_EQUAL
+%left '?' ':'
+%left BOOLEAN_OR
+%left BOOLEAN_AND
+%left '|'
+%left '^'
+%left '&'
+%nonassoc IS_EQUAL IS_NOT_EQUAL
+%nonassoc '<' IS_SMALLER_OR_EQUAL '>' IS_GREATER_OR_EQUAL
+%left SHIFT_LEFT SHIFT_RIGHT
+%left '+' '-' '.'
+%left '*' '/' '%'
+%right '!' '~' INCREMENT DECREMENT INT_CAST DOUBLE_CAST STRING_CAST ARRAY_CAST OBJECT_CAST '@'
+%right '['
+%nonassoc NEW
+%token T_EXIT
+%token IF
+%left ELSEIF
+%left ELSE
+%left ENDIF
+%token LNUMBER
+%token DNUMBER
+%token STRING
+%token VARIABLE
+%token NUM_STRING
+%token INLINE_HTML
+%token CHARACTER
+%token BAD_CHARACTER
+%token ENCAPSED_AND_WHITESPACE
+%token CONSTANT_ENCAPSED_STRING
+%token ZEND_ECHO
+%token DO
+%token WHILE
+%token ENDWHILE
+%token FOR
+%token ENDFOR
+%token ZEND_FOREACH
+%token T_ENDFOREACH
+%token ZEND_AS
+%token SWITCH
+%token ENDSWITCH
+%token CASE
+%token DEFAULT
+%token BREAK
+%token CONTINUE
+%token CONTINUED_WHILE
+%token CONTINUED_DOWHILE
+%token CONTINUED_FOR
+%token OLD_FUNCTION
+%token FUNCTION
+%token ZEND_CONST
+%token RETURN
+%token REQUIRE
+%token ZEND_GLOBAL
+%token ZEND_STATIC
+%token ZEND_UNSET
+%token T_ISSET
+%token T_EMPTY
+%token CLASS
+%token EXTENDS
+%token ZEND_OBJECT_OPERATOR
+%token ZEND_DOUBLE_ARROW
+%token ZEND_LIST
+%token ZEND_ARRAY
+%token VAR
+%token ZEND_LINE
+%token ZEND_FILE
+%token ZEND_COMMENT
+%token ZEND_ML_COMMENT
+%token PHP_OPEN_TAG
+%token PHP_OPEN_TAG_WITH_ECHO
+%token PHP_CLOSE_TAG
+%token T_WHITESPACE
+%token ZEND_HEREDOC
+%token DOLLAR_OPEN_CURLY_BRACES
+%token T_CURLY_OPEN
+%token T_PAAMAYIM_NEKUDOTAYIM
+%token T_PHP_TRACK_VARS
+
+%% /* Rules */
+
+statement_list:	
+		statement_list  { do_extended_info(CLS_C); } statement { HANDLE_INTERACTIVE(); }
+	|	/* empty */
+;
+
+
+statement:
+		'{' statement_list '}'
+	|	IF '(' expr ')' { do_if_cond(&$3, &$4 CLS_CC); } statement { do_if_after_statement(&$4, 1 CLS_CC); } elseif_list else_single { do_if_end(CLS_C); }
+	|	IF '(' expr ')' ':' { do_if_cond(&$3, &$4 CLS_CC); } statement_list { do_if_after_statement(&$4, 1 CLS_CC); } new_elseif_list new_else_single ENDIF ';' { do_if_end(CLS_C); }
+	|	WHILE '(' { $1.u.opline_num = get_next_op_number(CG(active_op_array));  } expr  ')' { do_while_cond(&$4, &$5 CLS_CC); } while_statement { do_while_end(&$1, &$5 CLS_CC); }
+	|	DO { $1.u.opline_num = get_next_op_number(CG(active_op_array));  do_do_while_begin(CLS_C); } statement WHILE '(' expr ')' ';' { do_do_while_end(&$1, &$6 CLS_CC); }
+	|	FOR 
+			'('
+				for_expr
+			';' { do_free(&$3 CLS_CC); $4.u.opline_num = get_next_op_number(CG(active_op_array)); }
+				for_expr
+			';' { do_for_cond(&$6, &$7 CLS_CC); }
+				for_expr
+			')' { do_free(&$9 CLS_CC); do_for_before_statement(&$4, &$7 CLS_CC); }
+			for_statement { do_for_end(&$7 CLS_CC); }
+	|	SWITCH '(' expr ')' { do_switch_cond(&$3 CLS_CC); } switch_case_list { do_switch_end(&$6 CLS_CC); }
+	|	BREAK ';'		 	{ do_brk_cont(ZEND_BRK, NULL CLS_CC); }
+	|	BREAK expr ';'		{ do_brk_cont(ZEND_BRK, &$2 CLS_CC); }
+	|	CONTINUE ';'		{ do_brk_cont(ZEND_CONT, NULL CLS_CC); }
+	|	CONTINUE expr ';'	{ do_brk_cont(ZEND_CONT, &$2 CLS_CC); }
+	|	FUNCTION { $1.u.opline_num = CG(zend_lineno); } STRING { do_begin_function_declaration(&$1, &$3, 0 CLS_CC); }
+			'(' parameter_list ')' '{' statement_list '}' { do_end_function_declaration(&$1 CLS_CC); }
+	|	OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } STRING  { do_begin_function_declaration(&$1, &$3, 0 CLS_CC); }
+			parameter_list '(' statement_list ')' ';' { do_end_function_declaration(&$1 CLS_CC); }
+	|	RETURN ';'			{ do_return(NULL CLS_CC); }
+	|	RETURN expr ';'		{ do_return(&$2 CLS_CC); }
+	|	ZEND_GLOBAL global_var_list
+	|	ZEND_STATIC static_var_list
+	|	CLASS STRING { do_begin_class_declaration(&$2, NULL CLS_CC); } '{' class_statement_list '}' { do_end_class_declaration(CLS_C); }
+	|	CLASS STRING EXTENDS STRING { do_begin_class_declaration(&$2, &$4 CLS_CC); } '{' class_statement_list '}' { do_end_class_declaration(CLS_C); }
+	|	ZEND_ECHO echo_expr_list ';'
+	|	INLINE_HTML			{ do_echo(&$1 CLS_CC); }
+	|	expr ';'			{ do_free(&$1 CLS_CC); }
+	|	REQUIRE CONSTANT_ENCAPSED_STRING ';'			{ require_filename($2.u.constant.value.str.val CLS_CC); zval_dtor(&$2.u.constant); }
+	|	REQUIRE '(' CONSTANT_ENCAPSED_STRING ')' ';'	{ require_filename($3.u.constant.value.str.val CLS_CC); zval_dtor(&$3.u.constant); }
+	|	ZEND_UNSET '(' r_cvar ')' ';' { do_unset(&$3 CLS_CC); }
+	|	ZEND_FOREACH '(' expr ZEND_AS { do_foreach_begin(&$1, &$3, &$2, &$4); } w_cvar foreach_optional_arg ')' { do_foreach_cont(&$6, &$7, &$4 CLS_CC); } foreach_statement { do_foreach_end(&$1, &$2 CLS_CC); }
+	|	';'		/* empty statement */
+;
+
+
+foreach_optional_arg:
+		/* empty */		{ $$.op_type = IS_UNUSED; }
+	|	ZEND_DOUBLE_ARROW w_cvar		{ $$ = $2; }
+;
+
+
+for_statement:
+		statement
+	|	':' statement_list ENDFOR ';'
+;
+
+
+foreach_statement:
+		statement
+	|	':' statement_list T_ENDFOREACH ';'
+;
+
+
+switch_case_list:
+		'{' case_list '}'					{ $$ = $2; }
+	|	'{' ';' case_list '}'				{ $$ = $3; }
+	|	':' case_list ENDSWITCH ';'			{ $$ = $2; }
+	|	':' ';' case_list ENDSWITCH ';'		{ $$ = $3; }
+;
+
+
+case_list:
+		/* empty */	{ $$.u.opline_num = -1; }
+	|	case_list CASE expr case_separator { do_case_before_statement(&$1, &$2, &$3 CLS_CC); } statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
+	|	case_list DEFAULT case_separator { do_default_before_statement(&$1, &$2 CLS_CC); } statement_list { do_case_after_statement(&$$, &$2 CLS_CC); }
+;
+
+
+case_separator:
+		':'
+	|	';'
+;
+
+
+while_statement:
+		statement
+	|	':' statement_list ENDWHILE ';'
+;
+
+
+
+elseif_list:
+		/* empty */
+	|	elseif_list ELSEIF '(' expr ')' { do_if_cond(&$4, &$5 CLS_CC); } statement { do_if_after_statement(&$5, 0 CLS_CC); }
+;
+
+
+new_elseif_list:
+		/* empty */
+	|	new_elseif_list ELSEIF '(' expr ')' ':' { do_if_cond(&$4, &$5 CLS_CC); } statement_list { do_if_after_statement(&$5, 0 CLS_CC); }
+;
+
+
+else_single:
+		/* empty */
+	|	ELSE statement
+;
+
+
+new_else_single:
+		/* empty */
+	|	ELSE ':' statement_list
+;
+
+
+
+
+parameter_list: 
+		non_empty_parameter_list
+	|	/* empty */
+;
+
+
+non_empty_parameter_list:
+		VARIABLE						{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=0; $$.u.constant.type=IS_LONG; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	'&' VARIABLE					{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=0; $$.u.constant.type=IS_LONG; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+	|	ZEND_CONST VARIABLE 			{ znode tmp;  fetch_simple_variable(&tmp, &$2, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=0; $$.u.constant.type=IS_LONG; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	VARIABLE '=' static_scalar		{ znode tmp;  fetch_simple_variable(&tmp, &$1, 0 CLS_CC); $$.op_type = IS_CONST; $$.u.constant.value.lval=0; $$.u.constant.type=IS_LONG; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$3, BYREF_NONE CLS_CC); }
+	|	non_empty_parameter_list ',' VARIABLE 						{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	non_empty_parameter_list ',' '&' VARIABLE					{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_FORCE CLS_CC); }
+	|	non_empty_parameter_list ',' ZEND_CONST VARIABLE			{ znode tmp;  fetch_simple_variable(&tmp, &$4, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV, &tmp, &$$, NULL, BYREF_NONE CLS_CC); }
+	|	non_empty_parameter_list ',' VARIABLE '=' static_scalar 	{ znode tmp;  fetch_simple_variable(&tmp, &$3, 0 CLS_CC); $$=$1; $$.u.constant.value.lval++; do_receive_arg(ZEND_RECV_INIT, &tmp, &$$, &$5, BYREF_NONE CLS_CC); }
+;
+
+
+function_call_parameter_list:
+		non_empty_function_call_parameter_list
+	|	/* empty */
+;
+
+
+non_empty_function_call_parameter_list:
+		expr_without_variable	{	$$.u.constant.value.lval = 0;  do_pass_param(&$1, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+	|	cvar					{	$$.u.constant.value.lval = 0;  do_pass_param(&$1, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+	|	'&' w_cvar 				{	$$.u.constant.value.lval = 0;  do_pass_param(&$2, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' expr_without_variable	{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAL, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' cvar 					{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$3, ZEND_SEND_VAR, $$.u.constant.value.lval CLS_CC); }
+	|	non_empty_function_call_parameter_list ',' '&' w_cvar				{	$$.u.constant.value.lval=$1.u.constant.value.lval+1;  do_pass_param(&$4, ZEND_SEND_REF, $$.u.constant.value.lval CLS_CC); }
+;
+
+global_var_list:
+		global_var_list ',' global_var { do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+	|	global_var { do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_GLOBAL CLS_CC); }
+;
+
+
+global_var:
+		VARIABLE			{ $$ = $1; }
+	|	'$' r_cvar			{ $$ = $2; }
+	|	'$' '{' expr '}'	{ $$ = $3; }
+;
+
+
+static_var_list:
+		static_var_list ',' VARIABLE { do_fetch_global_or_static_variable(&$3, NULL, ZEND_FETCH_STATIC CLS_CC); }
+	|	static_var_list ',' VARIABLE '=' static_scalar { do_fetch_global_or_static_variable(&$3, &$5, ZEND_FETCH_STATIC CLS_CC); }
+	|	VARIABLE  { do_fetch_global_or_static_variable(&$1, NULL, ZEND_FETCH_STATIC CLS_CC); }
+	|	VARIABLE '=' static_scalar { do_fetch_global_or_static_variable(&$1, &$3, ZEND_FETCH_STATIC CLS_CC); }
+
+;
+
+
+class_statement_list:
+		class_statement_list class_statement
+	|	/* empty */
+;
+
+
+class_statement:
+		VAR class_variable_decleration ';'
+	|	FUNCTION { $1.u.opline_num = CG(zend_lineno); } STRING { do_begin_function_declaration(&$1, &$3, 1 CLS_CC); } '(' 
+			parameter_list ')' '{' statement_list '}' { do_end_function_declaration(&$1 CLS_CC); }
+	|	OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } STRING { do_begin_function_declaration(&$1, &$3, 1 CLS_CC); }
+			parameter_list '(' statement_list ')' ';' { do_end_function_declaration(&$1 CLS_CC); }
+
+;
+
+
+class_variable_decleration:
+		class_variable_decleration ',' VARIABLE { do_declare_property(&$3, NULL CLS_CC); }
+	|	class_variable_decleration ',' VARIABLE '=' static_scalar  { do_declare_property(&$3, &$5 CLS_CC); }
+	|	VARIABLE	{ do_declare_property(&$1, NULL CLS_CC); }
+	|	VARIABLE '=' static_scalar { do_declare_property(&$1, &$3 CLS_CC); }
+;
+
+	
+echo_expr_list:	
+		/* empty */
+	|	echo_expr_list ',' expr { do_echo(&$3 CLS_CC); }
+	|	expr					{ do_echo(&$1 CLS_CC); }
+;
+
+
+for_expr:
+		/* empty */			{ $$.op_type = IS_CONST;  $$.u.constant.type = IS_BOOL;  $$.u.constant.value.lval = 1; }
+	|	for_expr ',' expr	{ $$ = $3; }
+	|	expr				{ $$ = $1; }
+;
+
+
+expr_without_variable:	
+		ZEND_LIST '(' { do_list_init(); } assignment_list ')' '=' expr { do_list_end(&$$, &$7 CLS_CC); }
+	|	w_cvar '=' expr		{ do_assign(&$$, &$1, &$3 CLS_CC); }
+	|	w_cvar '=' '&' w_cvar	{ do_assign_ref(&$$, &$1, &$4 CLS_CC); }
+	|	w_cvar '=' NEW class_name { do_extended_fcall_begin(CLS_C); do_begin_new_object(&$2, &$1, &$3, &$4 CLS_CC); } ctor_arguments { do_end_new_object(&$4, &$3 CLS_CC); do_extended_fcall_end(CLS_C);  $$ = $2;}
+	|	rw_cvar PLUS_EQUAL expr 	{ do_binary_assign_op(ZEND_ASSIGN_ADD, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar MINUS_EQUAL expr	{ do_binary_assign_op(ZEND_ASSIGN_SUB, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar MUL_EQUAL expr		{ do_binary_assign_op(ZEND_ASSIGN_MUL, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar DIV_EQUAL expr		{ do_binary_assign_op(ZEND_ASSIGN_DIV, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar CONCAT_EQUAL expr	{ do_binary_assign_op(ZEND_ASSIGN_CONCAT, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar MOD_EQUAL expr		{ do_binary_assign_op(ZEND_ASSIGN_MOD, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar AND_EQUAL expr		{ do_binary_assign_op(ZEND_ASSIGN_BW_AND, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar OR_EQUAL expr 		{ do_binary_assign_op(ZEND_ASSIGN_BW_OR, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar XOR_EQUAL expr 		{ do_binary_assign_op(ZEND_ASSIGN_BW_XOR, &$$, &$1, &$3 CLS_CC); }
+	|	rw_cvar SHIFT_LEFT_EQUAL expr	{ do_binary_assign_op(ZEND_ASSIGN_SL, &$$, &$1, &$3 CLS_CC); } 
+	|	rw_cvar SHIFT_RIGHT_EQUAL expr	{ do_binary_assign_op(ZEND_ASSIGN_SR, &$$, &$1, &$3 CLS_CC); } 
+	|	rw_cvar INCREMENT { do_post_incdec(&$$, &$1, ZEND_POST_INC CLS_CC); }
+	|	INCREMENT rw_cvar { do_pre_incdec(&$$, &$2, ZEND_PRE_INC CLS_CC); }
+	|	rw_cvar DECREMENT { do_post_incdec(&$$, &$1, ZEND_POST_DEC CLS_CC); }
+	|	DECREMENT rw_cvar { do_pre_incdec(&$$, &$2, ZEND_PRE_DEC CLS_CC); }
+	|	expr BOOLEAN_OR { do_boolean_or_begin(&$1, &$2 CLS_CC); } expr { do_boolean_or_end(&$$, &$1, &$4, &$2 CLS_CC); }
+	|	expr BOOLEAN_AND { do_boolean_and_begin(&$1, &$2 CLS_CC); } expr { do_boolean_and_end(&$$, &$1, &$4, &$2 CLS_CC); }  
+	|	expr LOGICAL_OR { do_boolean_or_begin(&$1, &$2 CLS_CC); } expr { do_boolean_or_end(&$$, &$1, &$4, &$2 CLS_CC); }
+	|	expr LOGICAL_AND { do_boolean_and_begin(&$1, &$2 CLS_CC); } expr { do_boolean_and_end(&$$, &$1, &$4, &$2 CLS_CC); }
+	|	expr LOGICAL_XOR expr { do_binary_op(ZEND_BOOL_XOR, &$$, &$1, &$3 CLS_CC); }
+	|	expr '|' expr	{ do_binary_op(ZEND_BW_OR, &$$, &$1, &$3 CLS_CC); }
+	|	expr '&' expr	{ do_binary_op(ZEND_BW_AND, &$$, &$1, &$3 CLS_CC); }
+	|	expr '^' expr	{ do_binary_op(ZEND_BW_XOR, &$$, &$1, &$3 CLS_CC); }
+	|	expr '.' expr 	{ do_binary_op(ZEND_CONCAT,&$$,&$1,&$3 CLS_CC); }
+	|	expr '+' expr 	{ do_binary_op(ZEND_ADD,&$$,&$1,&$3 CLS_CC); }
+	|	expr '-' expr 	{ do_binary_op(ZEND_SUB,&$$,&$1,&$3 CLS_CC); }
+	|	expr '*' expr	{ do_binary_op(ZEND_MUL,&$$,&$1,&$3 CLS_CC); }
+	|	expr '/' expr	{ do_binary_op(ZEND_DIV,&$$,&$1,&$3 CLS_CC); }
+	|	expr '%' expr 	{ do_binary_op(ZEND_MOD,&$$,&$1,&$3 CLS_CC); }
+	| 	expr SHIFT_LEFT expr { do_binary_op(ZEND_SL, &$$, &$1, &$3 CLS_CC); }
+	|	expr SHIFT_RIGHT expr { do_binary_op(ZEND_SR, &$$, &$1, &$3 CLS_CC); }
+	|	'+' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; $1.u.constant.refcount=1; do_binary_op(ZEND_ADD, &$$, &$1, &$2 CLS_CC); }
+	|	'-' expr { $1.u.constant.value.lval=0; $1.u.constant.type=IS_LONG; $1.op_type = IS_CONST; $1.u.constant.refcount=1; do_binary_op(ZEND_SUB, &$$, &$1, &$2 CLS_CC); }
+	|	'!' expr { do_unary_op(ZEND_BOOL_NOT, &$$, &$2 CLS_CC); }
+	|	'~' expr { do_unary_op(ZEND_BW_NOT, &$$, &$2 CLS_CC); }
+	|	expr IS_EQUAL expr				{ do_binary_op(ZEND_IS_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr IS_NOT_EQUAL expr 			{ do_binary_op(ZEND_IS_NOT_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr '<' expr 					{ do_binary_op(ZEND_IS_SMALLER, &$$, &$1, &$3 CLS_CC); }
+	|	expr IS_SMALLER_OR_EQUAL expr 	{ do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$1, &$3 CLS_CC); }
+	|	expr '>' expr 					{ do_binary_op(ZEND_IS_SMALLER, &$$, &$3, &$1 CLS_CC); }
+	|	expr IS_GREATER_OR_EQUAL expr 	{ do_binary_op(ZEND_IS_SMALLER_OR_EQUAL, &$$, &$3, &$1 CLS_CC); }
+	|	'(' expr ')' 	{ $$ = $2; }
+	|	expr '?' { do_begin_qm_op(&$1, &$2 CLS_CC); }
+		expr ':' { do_qm_true(&$4, &$2, &$5 CLS_CC); }
+		expr	 { do_qm_false(&$$, &$7, &$2, &$5 CLS_CC); }
+	|	STRING	'(' { do_extended_fcall_begin(CLS_C); do_begin_function_call(&$1 CLS_CC); }
+				function_call_parameter_list
+				')' { do_end_function_call(&$1, &$$, 0 CLS_CC); do_extended_fcall_end(CLS_C); }
+	|	r_cvar '(' { do_extended_fcall_begin(CLS_C); do_begin_dynamic_function_call(&$1 CLS_CC); } 
+				function_call_parameter_list 
+				')' { do_end_function_call(&$1, &$$, 0 CLS_CC); do_extended_fcall_end(CLS_C);}
+	|	STRING T_PAAMAYIM_NEKUDOTAYIM STRING '(' { do_extended_fcall_begin(CLS_C); do_begin_class_member_function_call(&$1, &$3 CLS_CC); } 
+											function_call_parameter_list 
+											')' { do_end_function_call(&$3, &$$, 1 CLS_CC); do_extended_fcall_end(CLS_C);}
+	|	internal_functions_in_yacc { $$ = $1; }
+	|	INT_CAST expr 		{ do_cast(&$$, &$2, IS_LONG CLS_CC); }
+	|	DOUBLE_CAST expr 	{ do_cast(&$$, &$2, IS_DOUBLE CLS_CC); }
+	|	STRING_CAST expr	{ do_cast(&$$, &$2, IS_STRING CLS_CC); } 
+	|	ARRAY_CAST expr 	{ do_cast(&$$, &$2, IS_ARRAY CLS_CC); }
+	|	OBJECT_CAST expr 	{ do_cast(&$$, &$2, IS_OBJECT CLS_CC); }
+	|	T_EXIT exit_expr	{ do_exit(&$$, &$2 CLS_CC); }
+	|	'@' { do_begin_silence(&$1 CLS_CC); } expr { do_end_silence(&$1 CLS_CC); $$ = $3; }
+	|	scalar				{ $$ = $1; }
+	|	ZEND_ARRAY '(' array_pair_list ')' { $$ = $3; }
+	|	'`' encaps_list '`'		{ do_shell_exec(&$$, &$2 CLS_CC); }
+	|	ZEND_PRINT expr  { do_print(&$$, &$2 CLS_CC); }
+;
+
+
+exit_expr:
+		/* empty */		{ $$.op_type = IS_UNUSED; }	
+	|	'(' ')'			{ $$.op_type = IS_UNUSED; }	
+	|	'(' expr ')'	{ $$ = $2; }
+;
+
+
+ctor_arguments:
+		/* empty */
+	|	'(' function_call_parameter_list ')'
+;
+
+
+class_name:
+		STRING	{ $$ = $1; }
+	|	r_cvar	{ $$ = $1; }
+;
+
+
+
+common_scalar:
+		LNUMBER 					{ $$=$1; }
+	|	DNUMBER 					{ $$=$1; }
+	|	CONSTANT_ENCAPSED_STRING	{ $$ = $1; }
+	|	ZEND_LINE 					{ $$ = $1; }
+	|	ZEND_FILE 					{ $$ = $1; }
+;
+
+
+static_scalar: /* compile-time evaluated scalars */
+		common_scalar		{ $$ = $1; }
+	|	STRING 				{ do_fetch_constant(&$$, &$1, ZEND_CT CLS_CC); }
+	|	'+' static_scalar	{ $$ = $1; }
+	|	'-' static_scalar	{ zval minus_one;  minus_one.type = IS_LONG; minus_one.value.lval = -1;  mul_function(&$2.u.constant, &$2.u.constant, &minus_one);  $$ = $2; }
+	|	ZEND_ARRAY '(' static_array_pair_list ')' { $$ = $3; }
+;
+
+
+scalar:
+		STRING 					{ do_fetch_constant(&$$, &$1, ZEND_RT CLS_CC); }
+	|	common_scalar			{ $$ = $1; }
+	|	'"' encaps_list '"' 	{ $$ = $2; }
+	|	'\'' encaps_list '\''	{ $$ = $2; }
+	|	ZEND_HEREDOC encaps_list ZEND_HEREDOC { $$ = $2; do_end_heredoc(CLS_C); }
+;
+
+
+static_array_pair_list:
+		/* empty */ 						{ $$.op_type = IS_CONST; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; array_init(&$$.u.constant); }
+	|	non_empty_static_array_pair_list	{ $$ = $1; }
+;
+
+
+non_empty_static_array_pair_list:
+		non_empty_static_array_pair_list ',' static_scalar ZEND_DOUBLE_ARROW static_scalar	{ do_add_static_array_element(&$$, &$3, &$5); }
+	|	non_empty_static_array_pair_list ',' static_scalar		{ do_add_static_array_element(&$$, &$3, NULL); }
+	|	static_scalar ZEND_DOUBLE_ARROW static_scalar	{ $$.op_type = IS_CONST; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, &$3); }
+	|	static_scalar 									{ $$.op_type = IS_CONST; $$.u.constant.refcount=1; $$.u.constant.is_ref=0; array_init(&$$.u.constant); do_add_static_array_element(&$$, &$1, NULL); }
+;
+
+expr:
+		r_cvar					{ $$ = $1; }
+	|	expr_without_variable	{ $$ = $1; }
+;
+
+
+
+r_cvar:
+	cvar { do_end_variable_parse(BP_VAR_R CLS_CC); $$ = $1; }
+;
+
+
+w_cvar:
+	cvar { do_end_variable_parse(BP_VAR_W CLS_CC); $$ = $1; }
+;
+
+
+rw_cvar:
+	cvar { do_end_variable_parse(BP_VAR_RW CLS_CC); $$ = $1; }
+;
+
+
+cvar:
+		cvar_without_objects { $$ = $1; }
+	|	cvar_without_objects ZEND_OBJECT_OPERATOR { do_push_object(&$1 CLS_CC); } ref_list { $$ = $4; }
+;
+
+
+cvar_without_objects:
+		reference_variable { $$ = $1; }
+	|	simple_indirect_reference reference_variable { do_indirect_references(&$$, &$1, &$2 CLS_CC); }
+;
+
+
+reference_variable:
+		dim_list ']' { $$ = $1; }
+	|	compound_variable		{ do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+;
+	
+
+compound_variable:
+		VARIABLE			{ $$ = $1; }
+	|	'$' '{' expr '}'	{ $$ = $3; }
+;
+
+
+dim_list:
+		dim_list ']' '[' dim_offset	{ fetch_array_dim(&$$, &$1, &$4 CLS_CC); }
+	|	compound_variable  { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); } '[' dim_offset		{ fetch_array_begin(&$$, &$1, &$4 CLS_CC); }
+;
+
+
+dim_offset:
+		/* empty */		{ $$.op_type = IS_UNUSED; }
+	|	expr			{ $$ = $1; }
+;
+
+
+ref_list:
+		object_property  { $$ = $1; }
+	|	ref_list ZEND_OBJECT_OPERATOR { do_push_object(&$1 CLS_CC); } object_property { $$ = $4; }
+;
+
+object_property:
+		scalar_object_property		{ znode tmp_znode;  do_pop_object(&tmp_znode CLS_CC);  do_fetch_property(&$$, &tmp_znode, &$1 CLS_CC); }
+	|	object_dim_list ']' { $$ = $1; }
+;
+
+scalar_object_property:
+		STRING			{ $$ = $1; }
+	|	'{' expr '}'	{ $$ = $2; }
+	|	cvar_without_objects { do_end_variable_parse(BP_VAR_R CLS_CC); $$ = $1; }
+;
+
+
+object_dim_list:
+		object_dim_list ']' '[' expr { fetch_array_dim(&$$, &$1, &$4 CLS_CC); }
+	|	STRING { znode tmp_znode, res;  do_pop_object(&tmp_znode CLS_CC);  do_fetch_property(&res, &tmp_znode, &$1 CLS_CC);  $1 = res; } '[' expr { fetch_array_dim(&$$, &$1, &$4 CLS_CC); }
+;
+
+
+simple_indirect_reference:
+		'$' { $$.u.constant.value.lval = 1; }
+	|	simple_indirect_reference '$' { $$.u.constant.value.lval++; }
+;
+
+assignment_list:
+		assignment_list ',' assignment_list_element
+	|	assignment_list_element
+;
+
+
+assignment_list_element:
+		w_cvar								{ do_add_list_element(&$1 CLS_CC); }
+	|	ZEND_LIST '(' { do_new_list_begin(CLS_C); } assignment_list ')'	{ do_new_list_end(CLS_C); }
+	|	/* empty */							{ do_add_list_element(NULL CLS_CC); }
+;
+
+
+array_pair_list:
+		/* empty */ 				{ do_init_array(&$$, NULL, NULL CLS_CC); }
+	|	non_empty_array_pair_list	{ $$ = $1; }
+;
+
+non_empty_array_pair_list:
+		non_empty_array_pair_list ',' expr ZEND_DOUBLE_ARROW expr	{ do_add_array_element(&$$, &$5, &$3 CLS_CC); }
+	|	non_empty_array_pair_list ',' expr		{ do_add_array_element(&$$, &$3, NULL CLS_CC); }
+	|	expr ZEND_DOUBLE_ARROW expr	{ do_init_array(&$$, &$3, &$1 CLS_CC); }
+	|	expr 						{ do_init_array(&$$, &$1, NULL CLS_CC); }
+;
+
+
+encaps_list:
+		encaps_list encaps_var { do_end_variable_parse(BP_VAR_R CLS_CC);  do_add_variable(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list STRING						{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list NUM_STRING					{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list ENCAPSED_AND_WHITESPACE		{ do_add_string(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list CHARACTER 					{ do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list BAD_CHARACTER				{ do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '['		{ $2.u.constant.value.chval = '['; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list ']'		{ $2.u.constant.value.chval = ']'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '{'		{ $2.u.constant.value.chval = '{'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list '}'		{ $2.u.constant.value.chval = '}'; do_add_char(&$$, &$1, &$2 CLS_CC); }
+	|	encaps_list ZEND_OBJECT_OPERATOR  { znode tmp;  $2.u.constant.value.chval = '-';  do_add_char(&tmp, &$1, &$2 CLS_CC);  $2.u.constant.value.chval = '>'; do_add_char(&$$, &tmp, &$2 CLS_CC); }
+	|	/* empty */			{ do_init_string(&$$); }
+
+;
+
+
+
+encaps_var:
+		VARIABLE { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+	|	VARIABLE '[' encaps_var_offset ']'	{ do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_array_begin(&$$, &$1, &$3 CLS_CC); }
+	|	VARIABLE ZEND_OBJECT_OPERATOR STRING { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$2, &$1, 1 CLS_CC); do_fetch_property(&$$, &$2, &$3 CLS_CC); }
+	|	DOLLAR_OPEN_CURLY_BRACES expr '}' { do_begin_variable_parse(CLS_C);  fetch_simple_variable(&$$, &$2, 1 CLS_CC); }
+	|	DOLLAR_OPEN_CURLY_BRACES STRING '[' expr ']' '}' { do_begin_variable_parse(CLS_C);  fetch_array_begin(&$$, &$2, &$4 CLS_CC); }
+	|	T_CURLY_OPEN cvar '}' { $$ = $2; }
+;
+
+
+encaps_var_offset:
+		STRING	{ $$ = $1; }
+	|	NUM_STRING	{ $$ = $1; }
+	|	{ do_begin_variable_parse(CLS_C); } VARIABLE { fetch_simple_variable(&$$, &$2, 1 CLS_CC); }
+;
+
+
+internal_functions_in_yacc:
+		T_ISSET '(' cvar ')'	{ do_isset_or_isempty(ZEND_ISSET, &$$, &$3 CLS_CC); }
+	|	T_EMPTY '(' cvar ')'	{ do_isset_or_isempty(ZEND_ISEMPTY, &$$, &$3 CLS_CC); }
+	|	INCLUDE expr 		{ do_include_or_eval(ZEND_INCLUDE, &$$, &$2 CLS_CC); }
+	|	EVAL '(' expr ')' 	{ do_include_or_eval(ZEND_EVAL, &$$, &$3 CLS_CC); }
+;
+
+
+%%
+

Zend/zend-scanner.h

@@ -0,0 +1,29 @@
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
+   +----------------------------------------------------------------------+
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef _LANGUAGE_SCANNER_H
+#define _LANGUAGE_SCANNER_H
+
+typedef struct {
+	YY_BUFFER_STATE buffer_state;
+	int state;
+	uint return_offset;
+	uint lineno;
+	FILE *in;
+	char *filename;
+} zend_lex_state;
+
+#endif

Zend/zend.c

@@ -2,15 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
@@ -19,83 +16,52 @@
 
 
 #include "zend.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
 #include "zend_extensions.h"
-#include "zend_modules.h"
+#include "modules.h"
 #include "zend_constants.h"
 #include "zend_list.h"
-#include "zend_API.h"
-#include "zend_builtin_functions.h"
-#include "zend_ini.h"
-
-#ifdef ZTS
-#	define GLOBAL_FUNCTION_TABLE	global_function_table
-#	define GLOBAL_CLASS_TABLE		global_class_table
-#	define GLOBAL_CONSTANTS_TABLE	global_constants_table
-#else
-#	define GLOBAL_FUNCTION_TABLE	CG(function_table)
-#	define GLOBAL_CLASS_TABLE		CG(class_table)
-#	define GLOBAL_CONSTANTS_TABLE	CG(zend_constants)
-#endif
-
-#if defined(ZEND_WIN32) && ZEND_DEBUG
-BOOL WINAPI IsDebuggerPresent(VOID);
-#endif
 
 /* true multithread-shared globals */
-ZEND_API zend_class_entry zend_standard_class_def;
+zend_class_entry standard_class;
 ZEND_API int (*zend_printf)(const char *format, ...);
-ZEND_API zend_write_func_t zend_write;
-ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
-ZEND_API void (*zend_block_interruptions)(void);
-ZEND_API void (*zend_unblock_interruptions)(void);
-ZEND_API void (*zend_ticks_function)(int ticks);
-ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
-
-static void (*zend_message_dispatcher_p)(long message, void *data);
-static int (*zend_get_configuration_directive_p)(char *name, uint name_length, zval *contents);
-
-
-#ifdef ZTS
-ZEND_API int compiler_globals_id;
-ZEND_API int executor_globals_id;
-ZEND_API int alloc_globals_id;
-HashTable *global_function_table;
-HashTable *global_class_table;
-HashTable *global_constants_table;
-#endif
+ZEND_API int (*zend_write)(const char *str, uint str_length);
+ZEND_API void (*zend_error)(int type, const char *format, ...);
+void (*zend_message_dispatcher)(long message, void *data);
+FILE *(*zend_fopen)(const char *filename);
+void (*zend_block_interruptions)();
+void (*zend_unblock_interruptions)();
 
 zend_utility_values zend_uv;
 
-ZEND_API zval zval_used_for_init; /* True global variable */
-
 /* version information */
 static char *zend_version_info;
 static uint zend_version_info_length;
-#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2001 Zend Technologies\n"
+#define ZEND_CORE_VERSION_INFO	"Zend Engine v" ZEND_VERSION ", Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski\n"
 
 
-#define PRINT_ZVAL_INDENT 4
+#define PRINT_PVAL_INDENT 4
 
 static void print_hash(HashTable *ht, int indent)
 {
 	zval **tmp;
 	char *string_key;
-	HashPosition iterator;
-	unsigned long num_key, str_len;
+	unsigned long num_key;
 	int i;
 
 	for (i=0; i<indent; i++) {
 		ZEND_PUTS(" ");
 	}
 	ZEND_PUTS("(\n");
-	indent += PRINT_ZVAL_INDENT;
-	zend_hash_internal_pointer_reset_ex(ht, &iterator);
-	while (zend_hash_get_current_data_ex(ht, (void **) &tmp, &iterator) == SUCCESS) {
+	indent += PRINT_PVAL_INDENT;
+	zend_hash_internal_pointer_reset(ht);
+	while (zend_hash_get_current_data(ht, (void **) &tmp) == SUCCESS) {
 		for (i=0; i<indent; i++) {
 			ZEND_PUTS(" ");
 		}
 		ZEND_PUTS("[");
-		switch (zend_hash_get_current_key_ex(ht, &string_key, &str_len, &num_key, 0, &iterator)) {
+		switch (zend_hash_get_current_key(ht, &string_key, &num_key)) {
 			case HASH_KEY_IS_STRING:
 				ZEND_PUTS(string_key);
 				break;
@@ -104,118 +70,65 @@ static void print_hash(HashTable *ht, int indent)
 				break;
 		}
 		ZEND_PUTS("] => ");
-		zend_print_zval_r(*tmp, indent+PRINT_ZVAL_INDENT);
+		zend_print_zval_r(*tmp, indent+PRINT_PVAL_INDENT);
 		ZEND_PUTS("\n");
-		zend_hash_move_forward_ex(ht, &iterator);
+		zend_hash_move_forward(ht);
 	}
-	indent -= PRINT_ZVAL_INDENT;
+	indent -= PRINT_PVAL_INDENT;
 	for (i=0; i<indent; i++) {
 		ZEND_PUTS(" ");
 	}
 	ZEND_PUTS(")\n");
 }
 
-
-ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy)
-{
-	if (expr->type==IS_STRING) {
-		*use_copy = 0;
-		return;
-	}
-	switch (expr->type) {
-		case IS_NULL:
-			expr_copy->value.str.len = 0;
-			expr_copy->value.str.val = empty_string;
-			break;
-		case IS_BOOL:
-			if (expr->value.lval) {
-				expr_copy->value.str.len = 1;
-				expr_copy->value.str.val = estrndup("1", 1);
-			} else {
-				expr_copy->value.str.len = 0;
-				expr_copy->value.str.val = empty_string;
-			}
-			break;
-		case IS_RESOURCE:
-			expr_copy->value.str.val = (char *) emalloc(sizeof("Resource id #")-1 + MAX_LENGTH_OF_LONG);
-			expr_copy->value.str.len = sprintf(expr_copy->value.str.val, "Resource id #%ld", expr->value.lval);
-			break;
-		case IS_ARRAY:
-			expr_copy->value.str.len = sizeof("Array")-1;
-			expr_copy->value.str.val = estrndup("Array", expr_copy->value.str.len);
-			break;
-		case IS_OBJECT:
-			expr_copy->value.str.len = sizeof("Object")-1;
-			expr_copy->value.str.val = estrndup("Object", expr_copy->value.str.len);
-			break;
-		default:
-			*expr_copy = *expr;
-			zval_copy_ctor(expr_copy);
-			convert_to_string(expr_copy);
-			break;
-	}
-	expr_copy->type = IS_STRING;
-	*use_copy = 1;
-}
-
-
 ZEND_API int zend_print_zval(zval *expr, int indent)
-{
-	return zend_print_zval_ex(zend_write, expr, indent);
-}
-
-
-ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent)
 {
 	zval expr_copy;
-	int use_copy;
+	int destroy=0;
 
-	zend_make_printable_zval(expr, &expr_copy, &use_copy);
-	if (use_copy) {
+	if (expr->type != IS_STRING) {
+		if (expr->type == IS_BOOL) {
+			if (expr->value.lval) {
+				expr_copy.value.str.val = estrndup("true",4);
+				expr_copy.value.str.len = 4;
+			} else {
+				expr_copy.value.str.val = estrndup("false",5);
+				expr_copy.value.str.len = 5;
+			}
+			expr_copy.type = IS_STRING;
+		} else if (expr->type == IS_RESOURCE) {
+			expr_copy.value.str.val = (char *) emalloc(sizeof("Resource id #")-1 + MAX_LENGTH_OF_LONG);
+			expr_copy.value.str.len = sprintf(expr_copy.value.str.val, "Resource id #%ld", expr->value.lval);
+			expr_copy.type = IS_STRING;
+		} else {
+			expr_copy = *expr;
+			zval_copy_ctor(&expr_copy);
+			convert_to_string(&expr_copy);
+		}
 		expr = &expr_copy;
+		destroy=1;
 	}
 	if (expr->value.str.len==0) { /* optimize away empty strings */
-		if (use_copy) {
-			zval_dtor(expr);
-		}
 		return 0;
 	}
-	write_func(expr->value.str.val,expr->value.str.len);
-	if (use_copy) {
+	ZEND_WRITE(expr->value.str.val,expr->value.str.len);
+	if (destroy) {
 		zval_dtor(expr);
 	}
 	return expr->value.str.len;
 }
 
 
-ZEND_API void zend_print_zval_r(zval *expr, int indent)
-{
-	zend_print_zval_r_ex(zend_write, expr, indent);
-}
-
-
-ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) 
+ZEND_API void zend_print_zval_r(zval *expr, int indent) 
 {
 	switch(expr->type) {
 		case IS_ARRAY:
 			ZEND_PUTS("Array\n");
-			if (++expr->value.ht->nApplyCount>1) {
-				ZEND_PUTS(" *RECURSION*");
-				expr->value.ht->nApplyCount=0;
-				return;
-			}
 			print_hash(expr->value.ht,indent);
-			expr->value.ht->nApplyCount--;
 			break;
 		case IS_OBJECT:
-			if (++expr->value.obj.properties->nApplyCount>1) {
-				ZEND_PUTS(" *RECURSION*");
-				expr->value.obj.properties->nApplyCount=0;
-				return;
-			}
 			zend_printf("%s Object\n", expr->value.obj.ce->name);
 			print_hash(expr->value.obj.properties, indent);
-			expr->value.obj.properties->nApplyCount--;
 			break;
 		default:
 			zend_print_variable(expr);
@@ -224,201 +137,61 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
 }
 
 
-static FILE *zend_fopen_wrapper(const char *filename, char **opened_path)
+static FILE *zend_fopen_wrapper(const char *filename)
 {
-	if (opened_path) {
-		*opened_path = estrdup(filename);
-	}
-	return fopen(filename, "rb");
+	return fopen(filename, "r");
 }
 
 
-static void register_standard_class(void)
+static void register_standard_class()
 {
-	zend_standard_class_def.type = ZEND_INTERNAL_CLASS;
-	zend_standard_class_def.name_length = sizeof("stdClass") - 1;
-	zend_standard_class_def.name = zend_strndup("stdClass", zend_standard_class_def.name_length);
-	zend_standard_class_def.parent = NULL;
-	zend_hash_init_ex(&zend_standard_class_def.default_properties, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
-	zend_hash_init_ex(&zend_standard_class_def.function_table, 0, NULL, ZEND_FUNCTION_DTOR, 1, 0);
-	zend_standard_class_def.handle_function_call = NULL;
-	zend_standard_class_def.handle_property_get = NULL;
-	zend_standard_class_def.handle_property_set = NULL;
-	zend_standard_class_def.refcount = (int *) malloc(sizeof(int));
-	*zend_standard_class_def.refcount = 1;
-	zend_hash_add(GLOBAL_CLASS_TABLE, "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry), NULL);
+	standard_class.type = ZEND_INTERNAL_CLASS;
+	standard_class.name_length = sizeof("stdClass") - 1;
+	standard_class.name = zend_strndup("stdClass", standard_class.name_length);
+	standard_class.parent = NULL;
+	zend_hash_init(&standard_class.default_properties, 0, NULL, PVAL_PTR_DTOR, 1);
+	zend_hash_init(&standard_class.function_table, 0, NULL, (void (*)(void *)) destroy_zend_function, 1);
+	standard_class.handle_function_call = NULL;
+	standard_class.handle_property_get = NULL;
+	standard_class.handle_property_set = NULL;
+	zend_hash_add(CG(class_table), "stdClass", sizeof("stdClass"), &standard_class, sizeof(zend_class_entry), NULL);
 }
 
 
-static void zend_set_default_compile_time_values(CLS_D)
+int zend_startup(zend_utility_functions *utility_functions, char **extensions)
 {
-	/* default compile-time values */
-	CG(asp_tags) = 0;
-	CG(short_tags) = 1;
-	CG(allow_call_time_pass_reference) = 1;
-	CG(extended_info) = 0;
-}
-
-
-#ifdef ZTS
-static void compiler_globals_ctor(zend_compiler_globals *compiler_globals)
-{
-	zend_function tmp_func;
-	zend_class_entry tmp_class;
-
-	compiler_globals->compiled_filename = NULL;
-
-	compiler_globals->function_table = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init_ex(compiler_globals->function_table, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
-	zend_hash_copy(compiler_globals->function_table, global_function_table, NULL, &tmp_func, sizeof(zend_function));
-
-	compiler_globals->class_table = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init_ex(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-	zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
-
-	zend_set_default_compile_time_values(CLS_C);
-}
-
-
-static void compiler_globals_dtor(zend_compiler_globals *compiler_globals)
-{
-	if (compiler_globals->function_table != global_function_table) {
-		zend_hash_destroy(compiler_globals->function_table);
-		free(compiler_globals->function_table);
-	}
-	if (compiler_globals->class_table != global_class_table) {
-		zend_hash_destroy(compiler_globals->class_table);
-		free(compiler_globals->class_table);
-	}
-}
-
-
-static void executor_globals_ctor(zend_executor_globals *executor_globals)
-{
-	if (global_constants_table) {
-		zend_startup_constants(ELS_C);
-		zend_copy_constants(executor_globals->zend_constants, global_constants_table);
-	}
-	zend_init_rsrc_plist(ELS_C);
-	EG(lambda_count)=0;
-	EG(user_error_handler) = NULL;
-}
-
-
-static void executor_globals_dtor(zend_executor_globals *executor_globals)
-{
-	zend_shutdown_constants(ELS_C);
-	zend_destroy_rsrc_plist(ELS_C);
-	zend_ini_shutdown(ELS_C);
-}
-
-
-static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
-{
-	start_memory_manager(ALS_C);
-}
-
-#endif
-
-#ifdef __FreeBSD__
-/* FreeBSD floating point precision fix */
-#include <floatingpoint.h>
-#endif
-
-#ifdef ZTS
-static void zend_new_thread_end_handler(THREAD_T thread_id)
-{
-	ELS_FETCH();
-
-	zend_copy_ini_directives(ELS_C);
-	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP ELS_CC);
-}
-#endif
-
-
-int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions)
-{
-#ifdef ZTS
-	zend_compiler_globals *compiler_globals;
-	zend_executor_globals *executor_globals;
-
-	alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, NULL);
-#else
-	start_memory_manager(ALS_C);
-#endif
-
-#ifdef __FreeBSD__
-	/* FreeBSD floating point precision fix */
-	fpsetmask(0);
-#endif
-
-	zend_startup_extensions_mechanism();
+	start_memory_manager();
 
 	/* Set up utility functions and values */
-	zend_error_cb = utility_functions->error_function;
+	zend_error = utility_functions->error_function;
 	zend_printf = utility_functions->printf_function;
-	zend_write = (zend_write_func_t) utility_functions->write_function;
+	zend_write = utility_functions->write_function;
 	zend_fopen = utility_functions->fopen_function;
 	if (!zend_fopen) {
 		zend_fopen = zend_fopen_wrapper;
 	}
-	zend_message_dispatcher_p = utility_functions->message_handler;
+	zend_message_dispatcher = utility_functions->message_handler;
 	zend_block_interruptions = utility_functions->block_interruptions;
 	zend_unblock_interruptions = utility_functions->unblock_interruptions;
-	zend_get_configuration_directive_p = utility_functions->get_configuration_directive;
-	zend_ticks_function = utility_functions->ticks_function;
-
-	zend_compile_file = compile_file;
+	zend_compile_files = compile_files;
 	zend_execute = execute;
 
+	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
+
 	/* set up version */
 	zend_version_info = strdup(ZEND_CORE_VERSION_INFO);
 	zend_version_info_length = sizeof(ZEND_CORE_VERSION_INFO)-1;
 
-	GLOBAL_FUNCTION_TABLE = (HashTable *) malloc(sizeof(HashTable));
-	GLOBAL_CLASS_TABLE = (HashTable *) malloc(sizeof(HashTable));
-	zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
-	zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
-	register_standard_class();
-	zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0);
-	zend_init_rsrc_list_dtors();
-
-	/* This zval can be used to initialize allocate zval's to an uninit'ed value */
-	zval_used_for_init.is_ref = 0;
-	zval_used_for_init.refcount = 1;
-	zval_used_for_init.type = IS_NULL;
-
-#ifdef ZTS
-	global_constants_table = NULL;
-	compiler_globals_id = ts_allocate_id(sizeof(zend_compiler_globals), (void (*)(void *)) compiler_globals_ctor, (void (*)(void *)) compiler_globals_dtor);
-	executor_globals_id = ts_allocate_id(sizeof(zend_executor_globals), (void (*)(void *)) executor_globals_ctor, (void (*)(void *)) executor_globals_dtor);
-	compiler_globals = ts_resource(compiler_globals_id);
-	executor_globals = ts_resource(executor_globals_id);
-	compiler_globals_dtor(compiler_globals);
-	compiler_globals->function_table = GLOBAL_FUNCTION_TABLE;
-	compiler_globals->class_table = GLOBAL_CLASS_TABLE;
-	zend_startup_constants(executor_globals);
-	GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
-#else
+	/* Prepare data structures */
 	zend_startup_constants();
-	zend_set_default_compile_time_values(CLS_C);
-	EG(user_error_handler) = NULL;
-#endif
-	zend_register_standard_constants(ELS_C);
-
-#ifndef ZTS
-	zend_init_rsrc_plist(ELS_C);
-#endif
-
-	if (start_builtin_functions) {
-		zend_startup_builtin_functions();
-	}
-
-	zend_ini_startup(ELS_C);
-
-#ifdef ZTS
-	tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
-#endif
+	CG(function_table) = (HashTable *) malloc(sizeof(HashTable));
+	CG(class_table) = (HashTable *) malloc(sizeof(HashTable));
+	zend_hash_init(CG(function_table), 100, NULL, (void (*)(void *)) destroy_zend_function, 1);
+	zend_hash_init(CG(class_table), 10, NULL, (void (*)(void *)) destroy_zend_class, 1);
+	register_standard_class();
+	zend_hash_init(&module_registry, 50, NULL, (void (*)(void *)) module_destructor, 1);
+	init_resource_plist();
+	zend_hash_init(&list_destructors, 50, NULL, NULL, 1);
 
 	return SUCCESS;
 }
@@ -426,30 +199,22 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 
 void zend_shutdown()
 {
-#ifdef ZEND_WIN32
-	zend_shutdown_timeout_thread();
-#endif
-#ifndef ZTS
-	zend_destroy_rsrc_plist();
-#endif
-	zend_destroy_rsrc_list_dtors();
+	destroy_resource_plist();
+	zend_hash_destroy(&list_destructors);
 	zend_hash_destroy(&module_registry);
-	zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
-	free(GLOBAL_FUNCTION_TABLE);
-	zend_hash_destroy(GLOBAL_CLASS_TABLE);
-	free(GLOBAL_CLASS_TABLE);
-	zend_shutdown_extensions();
+	zend_hash_destroy(CG(function_table));
+	free(CG(function_table));
+	zend_hash_destroy(CG(class_table));
+	free(CG(class_table));
+	zend_llist_destroy(&zend_extensions);
 	free(zend_version_info);
-#ifndef ZTS
 	zend_shutdown_constants();
-#endif
 }
 
 
 void zend_set_utility_values(zend_utility_values *utility_values)
 {
 	zend_uv = *utility_values;
-	zend_uv.import_use_extension_length = strlen(zend_uv.import_use_extension);
 }
 
 
@@ -460,16 +225,12 @@ void zenderror(char *error)
 }
 
 
-BEGIN_EXTERN_C()
 ZEND_API void zend_bailout()
 {
-	CLS_FETCH();
 	ELS_FETCH();
 
-	CG(unclean_shutdown) = 1;
 	longjmp(EG(bailout), FAILURE);
 }
-END_EXTERN_C()
 
 
 void zend_append_version_info(zend_extension *extension)
@@ -498,292 +259,3 @@ ZEND_API char *get_zend_version()
 {
 	return zend_version_info;
 }
-
-
-void zend_activate(CLS_D ELS_DC)
-{
-	init_compiler(CLS_C ELS_CC);
-	init_executor(CLS_C ELS_CC);
-	startup_scanner(CLS_C);
-}
-
-
-void zend_activate_modules()
-{
-	zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_request_startup);
-}
-
-void zend_deactivate_modules()
-{
-	ELS_FETCH();
-	EG(opline_ptr) = NULL; /* we're no longer executing anything */
-
-	if (setjmp(EG(bailout))==0) {
-		zend_hash_apply(&module_registry, (int (*)(void *)) module_registry_cleanup);
-	}
-}
-
-void zend_deactivate(CLS_D ELS_DC)
-{
-	/* we're no longer executing anything */
-	EG(opline_ptr) = NULL; 
-	EG(active_symbol_table) = NULL;
-
-	if (setjmp(EG(bailout))==0) {
-		shutdown_scanner(CLS_C);
-	}
-	if (setjmp(EG(bailout))==0) {
-		shutdown_executor(ELS_C);
-	}
-	if (setjmp(EG(bailout))==0) {
-		shutdown_compiler(CLS_C);
-	}
-	if (setjmp(EG(bailout))==0) {
-		zend_ini_deactivate(ELS_C);
-	}
-}
-
-
-BEGIN_EXTERN_C()
-ZEND_API void zend_message_dispatcher(long message, void *data)
-{
-	if (zend_message_dispatcher_p) {
-		zend_message_dispatcher_p(message, data);
-	}
-}
-END_EXTERN_C()
-
-
-ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval *contents)
-{
-	if (zend_get_configuration_directive_p) {
-		return zend_get_configuration_directive_p(name, name_length, contents);
-	} else {
-		return FAILURE;
-	}
-}
-
-
-#define ZEND_ERROR_BUFFER_SIZE 1024
-
-ZEND_API void zend_error(int type, const char *format, ...)
-{
-	va_list args;
-	zval ***params;
-	zval *retval;
-	zval *z_error_type, *z_error_message, *z_error_filename, *z_error_lineno, *z_context;
-	char *error_filename;
-	uint error_lineno;
-	zval *orig_user_error_handler;
-	ELS_FETCH();
-	CLS_FETCH();
-
-	/* Obtain relevant filename and lineno */
-	switch (type) {
-		case E_CORE_ERROR:
-		case E_CORE_WARNING:
-			error_filename = NULL;
-			error_lineno = 0;
-			break;
-		case E_PARSE:
-		case E_COMPILE_ERROR:
-		case E_COMPILE_WARNING:
-		case E_ERROR:
-		case E_NOTICE:
-		case E_WARNING:
-		case E_USER_ERROR:
-		case E_USER_WARNING:
-		case E_USER_NOTICE:
-			if (zend_is_compiling()) {
-				error_filename = zend_get_compiled_filename(CLS_C);
-				error_lineno = zend_get_compiled_lineno(CLS_C);
-			} else if (zend_is_executing()) {
-				error_filename = zend_get_executed_filename(ELS_C);
-				error_lineno = zend_get_executed_lineno(ELS_C);
-			} else {
-				error_filename = NULL;
-				error_lineno = 0;
-			}
-			break;
-		default:
-			error_filename = NULL;
-			error_lineno = 0;
-			break;
-	}
-	if (!error_filename) {
-		error_filename = "Unknown";
-	}
-
-
-	va_start(args, format);
-
-	/* if we don't have a user defined error handler */
-	if (!EG(user_error_handler)) {
-		zend_error_cb(type, error_filename, error_lineno, format, args);
-	} else switch (type) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_CORE_WARNING:
-		case E_COMPILE_ERROR:
-		case E_COMPILE_WARNING:
-			/* The error may not be safe to handle in user-space */
-			zend_error_cb(type, error_filename, error_lineno, format, args);
-			break;
-		default:
-			/* Handle the error in user space */
-			ALLOC_INIT_ZVAL(z_error_message);
-			ALLOC_INIT_ZVAL(z_error_type);
-			ALLOC_INIT_ZVAL(z_error_filename);
-			ALLOC_INIT_ZVAL(z_error_lineno);
-			ALLOC_INIT_ZVAL(z_context);
-			z_error_message->value.str.val = (char *) emalloc(ZEND_ERROR_BUFFER_SIZE);
-
-#ifdef HAVE_VSNPRINTF
-			z_error_message->value.str.len = vsnprintf(z_error_message->value.str.val, ZEND_ERROR_BUFFER_SIZE, format, args);
-			if (z_error_message->value.str.len > ZEND_ERROR_BUFFER_SIZE-1) {
-				z_error_message->value.str.len = ZEND_ERROR_BUFFER_SIZE-1;
-			}
-#else
-			strncpy(z_error_message->value.str.val, format, ZEND_ERROR_BUFFER_SIZE);
-			/* This is risky... */
-			/* z_error_message->value.str.len = vsprintf(z_error_message->value.str.val, format, args); */
-#endif
-			z_error_message->type = IS_STRING;
-
-			z_error_type->value.lval = type;
-			z_error_type->type = IS_LONG;
-
-			if (error_filename) {
-				z_error_filename->value.str.len = strlen(error_filename);
-				z_error_filename->value.str.val = estrndup(error_filename, z_error_filename->value.str.len);
-				z_error_filename->type = IS_STRING;
-			}
-				
-			z_error_lineno->value.lval = error_lineno;
-			z_error_lineno->type = IS_LONG;
-
-			z_context->value.ht = EG(active_symbol_table);
-			z_context->type = IS_ARRAY;
-			ZVAL_ADDREF(z_context);  /* we don't want this one to be freed */
-
-			params = (zval ***) emalloc(sizeof(zval **)*5);
-			params[0] = &z_error_type;
-			params[1] = &z_error_message;
-			params[2] = &z_error_filename;
-			params[3] = &z_error_lineno;
-			params[4] = &z_context;
-
-			orig_user_error_handler = EG(user_error_handler);
-			EG(user_error_handler) = NULL;
-			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL)==SUCCESS) {
-				zval_ptr_dtor(&retval);
-			} else {
-				/* The user error handler failed, use built-in error handler */
-				zend_error_cb(type, error_filename, error_lineno, format, args);
-			}
-			EG(user_error_handler) = orig_user_error_handler;
-
-			efree(params);
-			zval_ptr_dtor(&z_error_message);
-			zval_ptr_dtor(&z_error_type);
-			zval_ptr_dtor(&z_error_filename);
-			zval_ptr_dtor(&z_error_lineno);
-			if (ZVAL_REFCOUNT(z_context)==2) {
-				FREE_ZVAL(z_context);
-			}
-			break;
-	}
-
-	va_end(args);
-}
-
-
-ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...)
-{
-#if ZEND_DEBUG
-	va_list args;
-
-	va_start(args, format);
-#	ifdef ZEND_WIN32
-	{
-		char output_buf[1024];
-
-		vsnprintf(output_buf, 1024, format, args);
-		OutputDebugString(output_buf);
-		OutputDebugString("\n");
-		if (trigger_break && IsDebuggerPresent()) {
-			DebugBreak();
-		}
-	}
-#	else
-	vfprintf(stderr, format, args);
-	fprintf(stderr, "\n");
-#	endif
-	va_end(args);
-#endif
-}
-
-
-ZEND_API int zend_execute_scripts(int type CLS_DC ELS_DC, int file_count, ...)
-{
-	va_list files;
-	int i;
-	zend_file_handle *file_handle;
-
-	va_start(files, file_count);
-	for (i=0; i<file_count; i++) {
-		file_handle = va_arg(files, zend_file_handle *);
-		if (!file_handle) {
-			continue;
-		}
-		EG(active_op_array) = zend_compile_file(file_handle, ZEND_INCLUDE CLS_CC);
-		zend_destroy_file_handle(file_handle CLS_CC);
-		if (EG(active_op_array)) {
-			zend_execute(EG(active_op_array) ELS_CC);
-			zval_ptr_dtor(EG(return_value_ptr_ptr));
-			EG(return_value_ptr_ptr) = &EG(global_return_value_ptr);
-			EG(global_return_value_ptr) = NULL;
-			destroy_op_array(EG(active_op_array));
-			efree(EG(active_op_array));
-		} else if (type==ZEND_REQUIRE) {
-			va_end(files);
-			return FAILURE;
-		}
-	}
-	va_end(files);
-
-	return SUCCESS;
-}
-
-#define COMPILED_STRING_DESCRIPTION_FORMAT "%s(%d) : %s"
-
-ZEND_API char *zend_make_compiled_string_description(char *name)
-{
-	char *cur_filename;
-	int cur_lineno;
-	char *compiled_string_description;
-	CLS_FETCH();
-	ELS_FETCH();
-
-	if (zend_is_compiling()) {
-		cur_filename = zend_get_compiled_filename(CLS_C);
-		cur_lineno = zend_get_compiled_lineno(CLS_C);
-	} else if (zend_is_executing()) {
-		cur_filename = zend_get_executed_filename(ELS_C);
-		cur_lineno = zend_get_executed_lineno(ELS_C);
-	} else {
-		cur_filename = "Unknown";
-		cur_lineno = 0;
-	}
-
-	compiled_string_description = emalloc(sizeof(COMPILED_STRING_DESCRIPTION_FORMAT)+strlen(name)+strlen(cur_filename)+MAX_LENGTH_OF_LONG);
-	sprintf(compiled_string_description, COMPILED_STRING_DESCRIPTION_FORMAT, cur_filename, cur_lineno, name);
-	return compiled_string_description;
-}
-
-
-void free_estring(char **str_p)
-{
-	efree(*str_p);
-}

Zend/zend.h

@@ -2,34 +2,22 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
+#ifndef _ZEND_H
+#define _ZEND_H
 
-#ifndef ZEND_H
-#define ZEND_H
-
-#define ZEND_VERSION "1.0.5"
-
-#ifdef __cplusplus
-#define BEGIN_EXTERN_C() extern "C" {
-#define END_EXTERN_C() }
-#else
-#define BEGIN_EXTERN_C()
-#define END_EXTERN_C()
-#endif
+#define ZEND_VERSION "0.80A"
 
 #include <stdio.h>
 
@@ -37,120 +25,29 @@
  * general definitions
  */
 
-#ifdef ZEND_WIN32
-# include "zend_config.w32.h"
-# define ZEND_PATHS_SEPARATOR		';'
+#if WINNT||WIN32
+#include "config.w32.h"
 #else
-# include "zend_config.h"
-# define ZEND_PATHS_SEPARATOR		':'
-#endif
-
-/* all HAVE_XXX test have to be after the include of zend_config above */
-
-#ifdef HAVE_UNIX_H
-# include <unix.h>
-#endif
-
-#ifdef HAVE_STDARG_H
-# include <stdarg.h>
-#endif
-
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-
-#if defined(HAVE_LIBDL)
-
-# ifndef RTLD_LAZY
-#  define RTLD_LAZY 1    /* Solaris 1, FreeBSD's (2.1.7.1 and older) */
-# endif
-
-# ifndef RTLD_GLOBAL
-#  define RTLD_GLOBAL 0
-# endif
-
-# define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL)
-# define DL_UNLOAD					dlclose
-# define DL_FETCH_SYMBOL			dlsym
-# define DL_HANDLE					void *
-# define ZEND_EXTENSIONS_SUPPORT	1
-#elif defined(ZEND_WIN32)
-# define DL_LOAD(libname)			LoadLibrary(libname)
-# define DL_FETCH_SYMBOL			GetProcAddress
-# define DL_UNLOAD					FreeLibrary
-# define DL_HANDLE					HMODULE
-# define ZEND_EXTENSIONS_SUPPORT	1
-#else
-# define DL_HANDLE					void *
-# define ZEND_EXTENSIONS_SUPPORT	0
-#endif
-
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
-# define do_alloca(p) alloca(p)
-# define free_alloca(p)
-#else
-# define do_alloca(p)		emalloc(p)
-# define free_alloca(p)	efree(p)
-#endif
-
-#if ZEND_DEBUG
-#define ZEND_FILE_LINE_D				char *__zend_filename, uint __zend_lineno
-#define ZEND_FILE_LINE_DC				, ZEND_FILE_LINE_D
-#define ZEND_FILE_LINE_ORIG_D			char *__zend_orig_filename, uint __zend_orig_lineno
-#define ZEND_FILE_LINE_ORIG_DC			, ZEND_FILE_LINE_ORIG_D
-#define ZEND_FILE_LINE_RELAY_C			__zend_filename, __zend_lineno
-#define ZEND_FILE_LINE_RELAY_CC			, ZEND_FILE_LINE_RELAY_C
-#define ZEND_FILE_LINE_C				__FILE__, __LINE__
-#define ZEND_FILE_LINE_CC				, ZEND_FILE_LINE_C
-#define ZEND_FILE_LINE_EMPTY_C			NULL, 0
-#define ZEND_FILE_LINE_EMPTY_CC			, ZEND_FILE_LINE_EMPTY_C
-#define ZEND_FILE_LINE_ORIG_RELAY_C		__zend_orig_filename, __zend_orig_lineno
-#define ZEND_FILE_LINE_ORIG_RELAY_CC	, ZEND_FILE_LINE_ORIG_RELAY_C
-#else
-#define ZEND_FILE_LINE_D
-#define ZEND_FILE_LINE_DC
-#define ZEND_FILE_LINE_ORIG_D
-#define ZEND_FILE_LINE_ORIG_DC
-#define ZEND_FILE_LINE_RELAY_C
-#define ZEND_FILE_LINE_RELAY_CC
-#define ZEND_FILE_LINE_C
-#define ZEND_FILE_LINE_CC
-#define ZEND_FILE_LINE_EMPTY_C
-#define ZEND_FILE_LINE_EMPTY_CC
-#define ZEND_FILE_LINE_ORIG_RELAY_C
-#define ZEND_FILE_LINE_ORIG_RELAY_CC
-#endif	/* ZEND_DEBUG */
-
-#ifdef ZTS
-#define ZTS_V 1
-#else
-#define ZTS_V 0
+#include "config.h"
+#include "config.unix.h"
 #endif
 
 #include "zend_errors.h"
 #include "zend_alloc.h"
 
-typedef unsigned char zend_bool;
-typedef unsigned char zend_uchar;
-typedef unsigned int zend_uint;
-typedef unsigned long zend_ulong;
-typedef unsigned short zend_ushort;
 
 #undef SUCCESS
 #undef FAILURE
 #define SUCCESS 0
-#define FAILURE -1				/* this MUST stay a negative number, or it may affect functions! */
+#define FAILURE -1				/* this MUST stay a negative number, or it may effect functions! */
 
 
 #include "zend_hash.h"
 #include "zend_llist.h"
 
-#define INTERNAL_FUNCTION_PARAMETERS int ht, zval *return_value, zval *this_ptr, int return_value_used ELS_DC
-#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, this_ptr, return_value_used ELS_CC
+
+#define INTERNAL_FUNCTION_PARAMETERS HashTable *ht, zval *return_value, HashTable *list, HashTable *plist
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU ht, return_value, list, plist
 
 /*
  * zval
@@ -158,13 +55,14 @@ typedef unsigned short zend_ushort;
 typedef struct _zval_struct zval;
 typedef struct _zend_class_entry zend_class_entry;
 
-typedef union _zvalue_value {
+typedef union {
 	long lval;					/* long value */
 	double dval;				/* double value */
 	struct {
 		char *val;
 		int len;
 	} str;
+	char chval;					/* char value */
 	HashTable *ht;				/* hash table value */
 	struct {
 		zend_class_entry *ce;
@@ -176,47 +74,42 @@ typedef union _zvalue_value {
 struct _zval_struct {
 	/* Variable information */
 	zvalue_value value;		/* value */
-	zend_uchar type;	/* active type */
-	zend_uchar is_ref;
-	zend_ushort refcount;
+	unsigned char type;	/* active type */
+	unsigned char is_ref;
+	short refcount;
 };
 
 
 
-typedef struct _zend_function_entry {
+typedef struct {
 	char *fname;
 	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
 	unsigned char *func_arg_types;
-} zend_function_entry;
+} function_entry;
 
 
-typedef struct _zend_property_reference {
+typedef struct {
 	int type;  /* read, write or r/w */
-	zval *object;
-	zend_llist *elements_list;
+	zval **object;
+	zend_llist elements_list;
 } zend_property_reference;
 
 
 
-typedef struct _zend_overloaded_element {
+typedef struct {
 	int type;		/* array offset or object proprety */
 	zval element;
 } zend_overloaded_element;
 
-/* excpt.h on Digital Unix 4.0 defines function_table */
-#undef function_table
 
 struct _zend_class_entry {
 	char type;
 	char *name;
 	uint name_length;
 	struct _zend_class_entry *parent; 
-	int *refcount;
-	zend_bool constants_updated;
 
 	HashTable function_table;
 	HashTable default_properties;
-	zend_function_entry *builtin_functions;
 
 	/* handlers */
 	void (*handle_function_call)(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
@@ -226,127 +119,73 @@ struct _zend_class_entry {
 
 
 
-typedef struct _zend_utility_functions {
-	void (*error_function)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+typedef struct {
+	void (*error_function)(int type, const char *format, ...);
 	int (*printf_function)(const char *format, ...);
 	int (*write_function)(const char *str, uint str_length);
-	FILE *(*fopen_function)(const char *filename, char **opened_path);
+	FILE *(*fopen_function)(const char *filename);
 	void (*message_handler)(long message, void *data);
-	void (*block_interruptions)(void);
-	void (*unblock_interruptions)(void);
-	int (*get_configuration_directive)(char *name, uint name_length, zval *contents);
-	void (*ticks_function)(int ticks);
+	void (*block_interruptions)();
+	void (*unblock_interruptions)();
 } zend_utility_functions;
 
 		
-typedef struct _zend_utility_values {
-	char *import_use_extension;
-	uint import_use_extension_length;
+typedef struct {
+	unsigned char short_tags;
+	unsigned char asp_tags;
 } zend_utility_values;
 
 
-typedef int (*zend_write_func_t)(const char *str, uint str_length);
-
-
 #undef MIN
 #undef MAX
 #define MAX(a,b)  (((a)>(b))?(a):(b))
 #define MIN(a,b)  (((a)<(b))?(a):(b))
-#define ZEND_STRL(str)		(str), (sizeof(str)-1)
-#define ZEND_STRS(str)		(str), (sizeof(str)
-#define ZEND_NORMALIZE_BOOL(n)			\
-	((n) ? (((n)>0) ? 1 : -1) : 0)
-
 
 /* data types */
-#define IS_NULL		0
 #define IS_LONG		1
 #define IS_DOUBLE	2
 #define IS_STRING	3
 #define IS_ARRAY	4
 #define IS_OBJECT	5
-#define IS_BOOL		6
-#define IS_RESOURCE	7
-#define IS_CONSTANT	8
-#define IS_CONSTANT_ARRAY	9
-
-/* Special data type to temporarily mark large numbers */
-#define FLAG_IS_BC	10 /* for parser internal use only */
-
-/* overloaded elements data types */
-#define OE_IS_ARRAY	(1<<0)
-#define OE_IS_OBJECT	(1<<1)
-#define OE_IS_METHOD	(1<<2)
-
-
-/* Argument passing types */
-#define BYREF_NONE 0
-#define BYREF_FORCE 1
-#define BYREF_ALLOW 2
-#define BYREF_FORCE_REST 3
-
-int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
-void zend_shutdown(void);
+#define IS_BC 		6 /* for parser internal use only */
+#define IS_BOOL		7
+#define IS_RESOURCE 8
+#define IS_CONSTANT	9
+#define IS_METHOD	10 /* for overloaded function calls */
 
+int zend_startup(zend_utility_functions *utility_functions, char **extensions);
+void zend_shutdown();
 void zend_set_utility_values(zend_utility_values *utility_values);
-BEGIN_EXTERN_C()
-ZEND_API void zend_bailout(void);
-END_EXTERN_C()
-ZEND_API char *get_zend_version(void);
+ZEND_API void zend_bailout();
+ZEND_API char *get_zend_version();
 
-ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
 ZEND_API int zend_print_zval(zval *expr, int indent);
-ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent);
 ZEND_API void zend_print_zval_r(zval *expr, int indent);
-ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent);
-
-ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, ...);
-#if ZEND_DEBUG
-#define Z_DBG(expr)		(expr)
-#else
-#define	Z_DBG(expr)
-#endif
 
 ZEND_API extern char *empty_string;
+ZEND_API extern char *undefined_variable_string;
 
-ZEND_API void free_estring(char **str_p);
+#define STR_FREE(ptr) if (ptr && ptr!=empty_string && ptr!=undefined_variable_string) { efree(ptr); }
 
-#define STR_FREE(ptr) if (ptr && ptr!=empty_string) { efree(ptr); }
-#define STR_FREE_REL(ptr) if (ptr && ptr!=empty_string) { efree_rel(ptr); }
-
-#define STR_REALLOC(ptr, size)										\
-	if (ptr!=empty_string) {										\
-		ptr = (char *) erealloc(ptr, size);							\
-	} else {														\
-		ptr = (char *) emalloc(size);								\
-		memset(ptr, 0, size);										\
-	}
 
 /* output support */
 #define ZEND_WRITE(str, str_len)		zend_write((str), (str_len))
 #define ZEND_PUTS(str)					zend_write((str), strlen((str)))
 #define ZEND_PUTC(c)					zend_write(&(c), 1), (c)
 
-
-BEGIN_EXTERN_C()
 extern ZEND_API int (*zend_printf)(const char *format, ...);
-extern ZEND_API zend_write_func_t zend_write;
-extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
-extern ZEND_API void (*zend_block_interruptions)(void);
-extern ZEND_API void (*zend_unblock_interruptions)(void);
-extern ZEND_API void (*zend_ticks_function)(int ticks);
-extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
+extern ZEND_API int (*zend_write)(const char *str, uint str_length);
+extern ZEND_API void (*zend_error)(int type, const char *format, ...);
+extern FILE *(*zend_fopen)(const char *filename);
+extern void (*zend_message_dispatcher)(long message, void *data);
+extern void (*zend_block_interruptions)();
+extern void (*zend_unblock_interruptions)();
 
 
-ZEND_API void zend_error(int type, const char *format, ...);
-
 void zenderror(char *error);
 
-extern ZEND_API zend_class_entry zend_standard_class_def;
+extern zend_class_entry standard_class;
 extern zend_utility_values zend_uv;
-extern ZEND_API zval zval_used_for_init;
-
-END_EXTERN_C()
 
 #define ZEND_UV(name) (zend_uv.name)
 
@@ -354,110 +193,14 @@ END_EXTERN_C()
 #define HANDLE_BLOCK_INTERRUPTIONS()		if (zend_block_interruptions) { zend_block_interruptions(); }
 #define HANDLE_UNBLOCK_INTERRUPTIONS()		if (zend_unblock_interruptions) { zend_unblock_interruptions(); }
 
-BEGIN_EXTERN_C()
-ZEND_API void zend_message_dispatcher(long message, void *data);
-END_EXTERN_C()
 
-ZEND_API int zend_get_configuration_directive(char *name, uint name_length, zval *contents);
 
 
 /* Messages for applications of Zend */
-#define ZMSG_FAILED_INCLUDE_FOPEN		1L
-#define ZMSG_FAILED_REQUIRE_FOPEN		2L
-#define ZMSG_FAILED_HIGHLIGHT_FOPEN		3L
-#define ZMSG_MEMORY_LEAK_DETECTED		4L
-#define ZMSG_MEMORY_LEAK_REPEATED		5L
-#define ZMSG_LOG_SCRIPT_NAME			6L
+#define ZMSG_ENABLE_TRACK_VARS			1L
+#define ZMSG_FAILED_INCLUDE_FOPEN		2L
+#define ZMSG_FAILED_REQUIRE_FOPEN		3L
+#define ZMSG_FAILED_HIGHLIGHT_FOPEN		4L
+#define ZMSG_MEMORY_LEAK_DETECTED		5L
 
-
-#define ZVAL_ADDREF(pz)		(++(pz)->refcount)
-#define ZVAL_DELREF(pz)		(--(pz)->refcount)
-#define ZVAL_REFCOUNT(pz)	((pz)->refcount)
-
-#define INIT_PZVAL(z)		\
-	(z)->refcount = 1;		\
-	(z)->is_ref = 0;	
-
-#define INIT_ZVAL(z) z = zval_used_for_init;
-
-#define ALLOC_INIT_ZVAL(zp)						\
-	ALLOC_ZVAL(zp);		\
-	INIT_ZVAL(*zp);
-
-#define MAKE_STD_ZVAL(zv)				 \
-	ALLOC_ZVAL(zv); \
-	INIT_PZVAL(zv);
-
-#define PZVAL_IS_REF(z)		((z)->is_ref)
-
-#define SEPARATE_ZVAL(ppzv)									\
-	{														\
-		zval *orig_ptr = *(ppzv);							\
-															\
-		if (orig_ptr->refcount>1) {							\
-			orig_ptr->refcount--;							\
-			ALLOC_ZVAL(*(ppzv));							\
-			**(ppzv) = *orig_ptr;							\
-			zval_copy_ctor(*(ppzv));						\
-			(*(ppzv))->refcount=1;							\
-			(*(ppzv))->is_ref = 0;							\
-		}													\
-	}
-
-#define SEPARATE_ZVAL_IF_NOT_REF(ppzv)		\
-	if (!PZVAL_IS_REF(*ppzv)) {				\
-		SEPARATE_ZVAL(ppzv);				\
-	}
-
-#define SEPARATE_ZVAL_TO_MAKE_IS_REF(ppzv)	\
-	if (!PZVAL_IS_REF(*ppzv)) {				\
-		SEPARATE_ZVAL(ppzv);				\
-		(*(ppzv))->is_ref = 1;				\
-	}
-
-#define COPY_PZVAL_TO_ZVAL(zv, pzv)			\
-	(zv) = *(pzv);							\
-	if ((pzv)->refcount>1) {				\
-		zval_copy_ctor(&(zv));				\
-		(pzv)->refcount--;					\
-	} else {								\
-		FREE_ZVAL(pzv);						\
-	}										\
-	INIT_PZVAL(&(zv));
-
-#define REPLACE_ZVAL_VALUE(ppzv_dest,pzv_src,copy) {	\
-	int is_ref,refcount;						\
-												\
-	SEPARATE_ZVAL_IF_NOT_REF(ppzv_dest);		\
-	is_ref = (*ppzv_dest)->is_ref;				\
-	refcount = (*ppzv_dest)->refcount;			\
-	zval_dtor(*ppzv_dest);						\
-	**ppzv_dest = *pzv_src;						\
-	if(copy) {                                  \
-		zval_copy_ctor(*ppzv_dest);				\
-    }		                                    \
-	(*ppzv_dest)->is_ref = is_ref;				\
-	(*ppzv_dest)->refcount = refcount;			\
-}
-
-#define ZEND_MAX_RESERVED_RESOURCES	4
-
-#ifdef ZEND_WIN32
-/* Only use this macro if you know for sure that all of the switches values
-   are covered by its case statements */
-#define EMPTY_SWITCH_DEFAULT_CASE() \
-			default:				\
-				__assume(0);		\
-				break;
-#else
-#define EMPTY_SWITCH_DEFAULT_CASE()
-#endif
-
-#endif /* ZEND_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
+#endif /* _ZEND_H */

Zend/zend_API.h

@@ -2,454 +2,87 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
+#ifndef _ZEND_API_H
+#define _ZEND_API_H
 
-#ifndef ZEND_API_H
-#define ZEND_API_H
-
-#include "zend_modules.h"
+#include "modules.h"
 #include "zend_list.h"
-#include "zend_fast_cache.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
-#include "zend_execute.h"
-
-#define ZEND_FN(name) zend_if_##name
-#define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
-#define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
-
-#define ZEND_NAMED_FE(zend_name, name, arg_types) { #zend_name, name, arg_types },
-#define ZEND_FE(name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(name), arg_types)
-#define ZEND_FALIAS(name, alias, arg_types) ZEND_NAMED_FE(name, ZEND_FN(alias), arg_types)
-
-#define ZEND_MINIT(module)       zend_minit_##module
-#define ZEND_MSHUTDOWN(module)   zend_mshutdown_##module
-#define ZEND_RINIT(module)       zend_rinit_##module
-#define ZEND_RSHUTDOWN(module)   zend_rshutdown_##module
-#define ZEND_MINFO(module)       zend_info_##module
-#define ZEND_GINIT(module)       zend_ginit_##module
-#define ZEND_GSHUTDOWN(module)   zend_gshutdown_##module
-
-#define ZEND_MINIT_FUNCTION(module)      int ZEND_MINIT(module)(INIT_FUNC_ARGS)
-#define ZEND_MSHUTDOWN_FUNCTION(module)  int ZEND_MSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
-#define ZEND_RINIT_FUNCTION(module)      int ZEND_RINIT(module)(INIT_FUNC_ARGS)
-#define ZEND_RSHUTDOWN_FUNCTION(module)  int ZEND_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS)
-#define ZEND_MINFO_FUNCTION(module)      void ZEND_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS)
-#define ZEND_GINIT_FUNCTION(module)      int ZEND_GINIT(module)(GINIT_FUNC_ARGS)
-#define ZEND_GSHUTDOWN_FUNCTION(module)  int ZEND_GSHUTDOWN(module)(void)
-
-#define ZEND_GET_MODULE(name) \
-	ZEND_DLEXPORT zend_module_entry *get_module(void) { return &name##_module_entry; }
-
-#define ZEND_BEGIN_MODULE_GLOBALS(module_name)		\
-	typedef struct _zend_##module_name##_globals {
-#define ZEND_END_MODULE_GLOBALS(module_name)		\
-	} zend_##module_name##_globals;
-
-#ifdef ZTS
-
-#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
-	static ts_rsrc_id module_name##_globals_id;
-#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
-	module_name##_globals_id = ts_allocate_id(sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
-
-#else
-
-#define ZEND_DECLARE_MODULE_GLOBALS(module_name)							\
-	static zend_##module_name##_globals module_name##_globals;
-#define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)	\
-	globals_ctor(&module_name##_globals);
-
-#endif
-
-
-
-#define INIT_CLASS_ENTRY(class_container, class_name, functions)	\
-	{																\
-		class_container.name = strdup(class_name);					\
-		class_container.name_length = sizeof(class_name)-1;			\
-		class_container.builtin_functions = functions;				\
-		class_container.handle_function_call = NULL;				\
-		class_container.handle_property_get = NULL;					\
-		class_container.handle_property_set = NULL;					\
-	}
-
-#define INIT_OVERLOADED_CLASS_ENTRY(class_container, class_name, functions, handle_fcall, handle_propget, handle_propset) \
-	{															\
-		class_container.name = strdup(class_name);				\
-		class_container.name_length = sizeof(class_name)-1;		\
-		class_container.builtin_functions = functions;			\
-		class_container.handle_function_call = handle_fcall;	\
-		class_container.handle_property_get = handle_propget;	\
-		class_container.handle_property_set = handle_propset;	\
-	}
-
 
 
 int zend_next_free_module(void);
 
-ZEND_API int zend_get_parameters(int ht, int param_count, ...);
-ZEND_API int zend_get_parameters_array(int ht, int param_count, zval **argument_array);
-ZEND_API int zend_get_parameters_ex(int param_count, ...);
-ZEND_API int zend_get_parameters_array_ex(int param_count, zval ***argument_array);
-
-ZEND_API int ParameterPassedByReference(int ht, uint n);
-
-int zend_register_functions(zend_function_entry *functions, HashTable *function_table, int type);
-void zend_unregister_functions(zend_function_entry *functions, int count, HashTable *function_table);
-ZEND_API int zend_register_module(zend_module_entry *module_entry);
-
-ZEND_API zend_class_entry *zend_register_internal_class(zend_class_entry *class_entry);
-ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *class_entry, zend_class_entry *parent_ce, char *parent_name);
-
-ZEND_API zend_module_entry *zend_get_module(int module_number);
-ZEND_API int zend_disable_function(char *function_name, uint function_name_length);
+int getParameters(HashTable *ht, int param_count,...);
+int getParametersArray(HashTable *ht, int param_count, zval **argument_array);
+int getThis(zval **this);
+int ParameterPassedByReference(HashTable *ht, uint n);
+int register_functions(function_entry *functions);
+void unregister_functions(function_entry *functions, int count);
+int register_module(zend_module_entry *module_entry);
+zend_class_entry *register_internal_class(zend_class_entry *class_entry);
 
 ZEND_API void wrong_param_count(void);
-ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name);
 
-#define getThis() (this_ptr)
+#define WRONG_PARAM_COUNT { wrong_param_count(); return; }
+#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) { wrong_param_count(); return ret; }
+#define ARG_COUNT(ht) (ht->nNextFreeElement)
 
-#define WRONG_PARAM_COUNT					ZEND_WRONG_PARAM_COUNT()
-#define WRONG_PARAM_COUNT_WITH_RETVAL(ret)	ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
-#define ARG_COUNT(dummy)	(ht)
-#define ZEND_NUM_ARGS()		(ht)
-#define ZEND_WRONG_PARAM_COUNT()					{ wrong_param_count(); return; }
-#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)		{ wrong_param_count(); return ret; }
+#define BYREF_NONE 0
+#define BYREF_FORCE 1
+#define BYREF_ALLOW 2
 
-#ifndef ZEND_WIN32
+#if !MSVC5
 #define DLEXPORT
 #endif
 
-ZEND_API int zend_startup_module(zend_module_entry *module);
+int zend_startup_module(zend_module_entry *module);
 
-#define array_init(arg)			_array_init((arg) ZEND_FILE_LINE_CC)
-#define object_init(arg)		_object_init((arg) ZEND_FILE_LINE_CC)
-#define object_init_ex(arg, ce)	_object_init_ex((arg), (ce) ZEND_FILE_LINE_CC)
-ZEND_API int _array_init(zval *arg ZEND_FILE_LINE_DC);
-ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC);
-ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC);
-
-/* no longer supported */
+ZEND_API int array_init(zval *arg);
+ZEND_API int object_init(zval *arg);
+ZEND_API int object_init_ex(zval *arg, zend_class_entry *ce);
+ZEND_API int add_assoc_long(zval *arg, char *key, long n);
+ZEND_API int add_assoc_double(zval *arg, char *key, double d);
+ZEND_API int add_assoc_string(zval *arg, char *key, char *str, int duplicate);
+ZEND_API int add_assoc_stringl(zval *arg, char *key, char *str, uint length, int duplicate);
 ZEND_API int add_assoc_function(zval *arg, char *key,void (*function_ptr)(INTERNAL_FUNCTION_PARAMETERS));
-
-ZEND_API int add_assoc_long_ex(zval *arg, char *key, uint key_len, long n);
-ZEND_API int add_assoc_null_ex(zval *arg, char *key, uint key_len);
-ZEND_API int add_assoc_bool_ex(zval *arg, char *key, uint key_len, int b);
-ZEND_API int add_assoc_resource_ex(zval *arg, char *key, uint key_len, int r);
-ZEND_API int add_assoc_double_ex(zval *arg, char *key, uint key_len, double d);
-ZEND_API int add_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
-ZEND_API int add_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, int duplicate);
-ZEND_API int add_assoc_zval_ex(zval *arg, char *key, uint key_len, zval *value);
-
-#define add_assoc_long(__arg, __key, __n) add_assoc_long_ex(__arg, __key, strlen(__key)+1, __n)
-#define add_assoc_null(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
-#define add_assoc_bool(__arg, __key, __b) add_assoc_bool_ex(__arg, __key, strlen(__key)+1, __b)
-#define add_assoc_resource(__arg, __key, __r) add_assoc_resource_ex(__arg, __key, strlen(__key)+1, __r)
-#define add_assoc_double(__arg, __key, __d) add_assoc_double_ex(__arg, __key, strlen(__key)+1, __d)
-#define add_assoc_string(__arg, __key, __str, __duplicate) add_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
-#define add_assoc_stringl(__arg, __key, __str, __length, __duplicate) add_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
-#define add_assoc_zval(__arg, __key, __value) add_assoc_zval_ex(__arg, __key, strlen(__key)+1, __value)
-
-/* unset() functions are only suported for legacy modules and null() functions should be used */
-#define add_assoc_unset(__arg, __key) add_assoc_null_ex(__arg, __key, strlen(__key) + 1)
-#define add_index_unset(__arg, __key) add_index_null(__arg, __key)
-#define add_next_index_unset(__arg) add_next_index_null(__arg)
-#define add_property_unset(__arg, __key) add_property_null(__arg, __key)
-
 ZEND_API int add_index_long(zval *arg, uint idx, long n);
-ZEND_API int add_index_null(zval *arg, uint idx);
-ZEND_API int add_index_bool(zval *arg, uint idx, int b);
-ZEND_API int add_index_resource(zval *arg, uint idx, int r);
 ZEND_API int add_index_double(zval *arg, uint idx, double d);
 ZEND_API int add_index_string(zval *arg, uint idx, char *str, int duplicate);
 ZEND_API int add_index_stringl(zval *arg, uint idx, char *str, uint length, int duplicate);
-ZEND_API int add_index_zval(zval *arg, uint index, zval *value);
-
 ZEND_API int add_next_index_long(zval *arg, long n);
-ZEND_API int add_next_index_null(zval *arg);
-ZEND_API int add_next_index_bool(zval *arg, int b);
-ZEND_API int add_next_index_resource(zval *arg, int r);
 ZEND_API int add_next_index_double(zval *arg, double d);
 ZEND_API int add_next_index_string(zval *arg, char *str, int duplicate);
 ZEND_API int add_next_index_stringl(zval *arg, char *str, uint length, int duplicate);
-ZEND_API int add_next_index_zval(zval *arg, zval *value);
-
-ZEND_API int add_get_assoc_string_ex(zval *arg, char *key, uint key_len, char *str, void **dest, int duplicate);
-ZEND_API int add_get_assoc_stringl_ex(zval *arg, char *key, uint key_len, char *str, uint length, void **dest, int duplicate);
-
-#define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate)
-#define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate)
 
+ZEND_API int add_get_assoc_string(zval *arg, char *key, char *str, void **dest, int duplicate);
+ZEND_API int add_get_assoc_stringl(zval *arg, char *key, char *str, uint length, void **dest, int duplicate);
 ZEND_API int add_get_index_long(zval *arg, uint idx, long l, void **dest);
 ZEND_API int add_get_index_double(zval *arg, uint idx, double d, void **dest);
 ZEND_API int add_get_index_string(zval *arg, uint idx, char *str, void **dest, int duplicate);
 ZEND_API int add_get_index_stringl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate);
 
-ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long l);
-ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len);
-ZEND_API int add_property_bool_ex(zval *arg, char *key, uint key_len, int b);
-ZEND_API int add_property_resource_ex(zval *arg, char *key, uint key_len, long r);
-ZEND_API int add_property_double_ex(zval *arg, char *key, uint key_len, double d);
-ZEND_API int add_property_string_ex(zval *arg, char *key, uint key_len, char *str, int duplicate);
-ZEND_API int add_property_stringl_ex(zval *arg, char *key, uint key_len,  char *str, uint length, int duplicate);
-ZEND_API int add_property_zval_ex(zval *arg, char *key, uint key_len, zval *value);
+ZEND_API int call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval, int param_count, zval *params[]);
 
-#define add_property_long(__arg, __key, __n) add_property_long_ex(__arg, __key, strlen(__key)+1, __n)
-#define add_property_null(__arg, __key) add_property_null_ex(__arg, __key, strlen(__key) + 1)
-#define add_property_bool(__arg, __key, __b) add_property_bool_ex(__arg, __key, strlen(__key)+1, __b)
-#define add_property_resource(__arg, __key, __r) add_property_resource_ex(__arg, __key, strlen(__key)+1, __r)
-#define add_property_double(__arg, __key, __d) add_property_double_ex(__arg, __key, strlen(__key)+1, __d) 
-#define add_property_string(__arg, __key, __str, __duplicate) add_property_string_ex(__arg, __key, strlen(__key)+1, __str, __duplicate)
-#define add_property_stringl(__arg, __key, __str, __length, __duplicate) add_property_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __duplicate)
-#define add_property_zval(__arg, __key, __value) add_property_zval_ex(__arg, __key, strlen(__key)+1, __value)       
 
-ZEND_API int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[]);
-ZEND_API int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table);
-
-ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length,
-                                  int is_ref, int num_symbol_tables, ...);
+ZEND_API int add_property_long(zval *arg, char *key, long l);
+ZEND_API int add_property_double(zval *arg, char *key, double d);
+ZEND_API int add_property_string(zval *arg, char *key, char *str, int duplicate);
+ZEND_API int add_property_stringl(zval *arg, char *key, char *str, uint length, int duplicate);
 
 #define add_method(arg,key,method)	add_assoc_function((arg),(key),(method))
 
-#define ZVAL_RESOURCE(z,l) {			\
-		(z)->type = IS_RESOURCE;        \
-		(z)->value.lval = l;	        \
-	}
-#define ZVAL_BOOL(z,b) {				\
-		(z)->type = IS_BOOL;	        \
-		(z)->value.lval = b;	        \
-	}
-#define ZVAL_NULL(z) {					\
-		(z)->type = IS_NULL;	        \
-	}
-#define ZVAL_LONG(z,l) {				\
-		(z)->type = IS_LONG;	        \
-		(z)->value.lval = l;	        \
-	}
-#define ZVAL_DOUBLE(z,d) {				\
-		(z)->type = IS_DOUBLE;	        \
-		(z)->value.dval = d;	        \
-	}
-#define ZVAL_STRING(z,s,duplicate) {	\
-		char *__s=(s);					\
-		(z)->value.str.len = strlen(__s);	\
-		(z)->value.str.val = (duplicate?estrndup(__s,(z)->value.str.len):__s);	\
-		(z)->type = IS_STRING;	        \
-	}
-#define ZVAL_STRINGL(z,s,l,duplicate) {	\
-		char *__s=(s); int __l=l;		\
-		(z)->value.str.len = __l;	    \
-		(z)->value.str.val = (duplicate?estrndup(__s,__l):__s);	\
-		(z)->type = IS_STRING;		    \
-	}
-
-#define ZVAL_EMPTY_STRING(z) {	        \
-		(z)->value.str.len = 0;  	    \
-		(z)->value.str.val = empty_string; \
-		(z)->type = IS_STRING;		    \
-	}
-
-#define ZVAL_FALSE  { (z)->value.lval = 0;  (z)->type = IS_BOOL; }
-#define ZVAL_TRUE   { (z)->value.lval = 1;  (z)->type = IS_BOOL; }
-
-#define RETVAL_RESOURCE(l) {			\
-		return_value->type = IS_RESOURCE;\
-		return_value->value.lval = l;	\
-	}
-#define RETVAL_BOOL(b) {				\
-		return_value->type = IS_BOOL;	\
-		return_value->value.lval = b;	\
-	}
-#define RETVAL_NULL() {					\
-		return_value->type = IS_NULL;	\
-	}
-#define RETVAL_LONG(l) {				\
-		return_value->type = IS_LONG;	\
-		return_value->value.lval = l;	\
-	}
-#define RETVAL_DOUBLE(d) {				\
-		return_value->type = IS_DOUBLE;	\
-		return_value->value.dval = d;	\
-	}
-#define RETVAL_STRING(s,duplicate) {	\
-		char *__s=(s);					\
-		return_value->value.str.len = strlen(__s);	\
-		return_value->value.str.val = (duplicate?estrndup(__s,return_value->value.str.len):__s);	\
-		return_value->type = IS_STRING;	\
-	}
-#define RETVAL_STRINGL(s,l,duplicate) {		\
-		char *__s=(s); int __l=l;			\
-		return_value->value.str.len = __l;	\
-		return_value->value.str.val = (duplicate?estrndup(__s,__l):__s);	\
-		return_value->type = IS_STRING;		\
-	}
-
-#define RETVAL_EMPTY_STRING() {	            \
-		return_value->value.str.len = 0;  	\
-		return_value->value.str.val = empty_string; \
-		return_value->type = IS_STRING;		\
-	}
-
-#define RETVAL_FALSE  { return_value->value.lval = 0;  return_value->type = IS_BOOL; }
-#define RETVAL_TRUE   { return_value->value.lval = 1;  return_value->type = IS_BOOL; }
-
-#define RETURN_RESOURCE(l) {			\
-		return_value->type = IS_RESOURCE;\
-		return_value->value.lval = l;	\
-		return;							\
-	}
-
-#define RETURN_BOOL(b) {				\
-		return_value->type = IS_BOOL;	\
-		return_value->value.lval = b;	\
-		return;							\
-	}
-
-#define RETURN_NULL() {				\
-		return_value->type = IS_NULL;	\
-		return;							\
-	}
-
-#define RETURN_LONG(l) {				\
-		return_value->type = IS_LONG;	\
-		return_value->value.lval = l;	\
-		return;							\
-	}
-#define RETURN_DOUBLE(d) {				\
-		return_value->type = IS_DOUBLE;	\
-		return_value->value.dval = d;	\
-		return;							\
-	}
-#define RETURN_STRING(s,duplicate) {	\
-		char *__s=(s);					\
-		return_value->value.str.len = strlen(__s);	\
-		return_value->value.str.val = (duplicate?estrndup(__s,return_value->value.str.len):__s);	\
-		return_value->type = IS_STRING;	\
-		return;							\
-	}
-#define RETURN_STRINGL(s,l,duplicate) {		\
-		char *__s=(s); int __l=l;			\
-		return_value->value.str.len = __l;	\
-		return_value->value.str.val = (duplicate?estrndup(__s,__l):__s);	\
-      	return_value->type = IS_STRING;		\
-		return;								\
-	}
-
-#define RETURN_EMPTY_STRING() {	            \
-		return_value->value.str.len = 0;  	\
-		return_value->value.str.val = empty_string; \
-		return_value->type = IS_STRING;		\
-        return;                             \
-	}
-
-#define RETURN_FALSE  { RETVAL_FALSE; return; }
-#define RETURN_TRUE   { RETVAL_TRUE; return; }
-
-#define SET_VAR_STRING(n,v)	{																				\
-								{																			\
-									zval *var;																\
-									char *str=(v); /* prevent 'v' from being evaluated more than once */	\
-																											\
-									ALLOC_ZVAL(var);														\
-									var->value.str.val = (str);												\
-									var->value.str.len = strlen((str));										\
-									var->type = IS_STRING;													\
-									ZEND_SET_GLOBAL_VAR(n, var);											\
-								}																			\
-							}
-
-#define SET_VAR_STRINGL(n,v,l)	{														\
-									{													\
-										zval *var;										\
-																						\
-										ALLOC_ZVAL(var);								\
-										var->value.str.val = (v);						\
-										var->value.str.len = (l);						\
-										var->type = IS_STRING;							\
-										ZEND_SET_GLOBAL_VAR(n, var);					\
-									}													\
-								}
-
-#define SET_VAR_LONG(n,v)	{															\
-								{														\
-									zval *var;											\
-																						\
-									ALLOC_ZVAL(var);									\
-									var->value.lval = (v);								\
-									var->type = IS_LONG;								\
-									ZEND_SET_GLOBAL_VAR(n, var);						\
-								}														\
-							}
-
-#define SET_VAR_DOUBLE(n,v)	{															\
-								{														\
-									zval *var;											\
-																						\
-									ALLOC_ZVAL(var);									\
-									var->value.dval = (v);								\
-									var->type = IS_DOUBLE;								\
-									ZEND_SET_GLOBAL_VAR(n, var);						\
-								}														\
-							}
-
-
-#define ZEND_SET_SYMBOL(symtable, name, var)										\
-	{																				\
-		char *_name = (name);														\
-																					\
-		ZEND_SET_SYMBOL_WITH_LENGTH(symtable, _name, strlen(_name)+1, var, 1, 0);	\
-	}
-
-#define ZEND_SET_SYMBOL_WITH_LENGTH(symtable, name, name_length, var, _refcount, _is_ref)				\
-	{																									\
-		zval **orig_var;																				\
-																										\
-		if (zend_hash_find(symtable, (name), (name_length), (void **) &orig_var)==SUCCESS				\
-			&& PZVAL_IS_REF(*orig_var)) {																\
-			(var)->refcount = (*orig_var)->refcount;													\
-			(var)->is_ref = 1;																			\
-																										\
-			if (_refcount) {																			\
-				(var)->refcount += _refcount-1;															\
-			}																							\
-			zval_dtor(*orig_var);																		\
-			**orig_var = *(var);																		\
-			FREE_ZVAL(var);																					\
-		} else {																						\
-			(var)->is_ref = _is_ref;																	\
-			if (_refcount) {																			\
-				(var)->refcount = _refcount;															\
-			}																							\
-			zend_hash_update(symtable, (name), (name_length), &(var), sizeof(zval *), NULL);			\
-		}																								\
-	}
-
-
-#define ZEND_SET_GLOBAL_VAR(name, var)				\
-	ZEND_SET_SYMBOL(&EG(symbol_table), name, var)
-
-#define ZEND_SET_GLOBAL_VAR_WITH_LENGTH(name, name_length, var, _refcount, _is_ref)		\
-	ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), name, name_length, var, _refcount, _is_ref)
-
-#define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL)))
-#define ZVAL_IS_NULL(z) ((z)->type==IS_NULL)
-
-#endif /* ZEND_API_H */
+#endif							/* _ZEND_API_H */
 
 /*
  * Local variables:

Zend/zend_alloc.c

@@ -2,43 +2,29 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
 #include <stdlib.h>
 
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_globals.h"
-#include "zend_fast_cache.h"
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 
 #ifndef ZTS
-ZEND_API zend_alloc_globals alloc_globals;
+static zend_alloc_globals alloc_globals;
 #endif
 
 
-#define ZEND_DISABLE_MEMORY_CACHE 0
-
-
 #if ZEND_DEBUG
 # define END_MAGIC_SIZE sizeof(long)
 # define END_ALIGNMENT(size) (((size)%PLATFORM_ALIGNMENT)?(PLATFORM_ALIGNMENT-((size)%PLATFORM_ALIGNMENT)):0)
@@ -50,31 +36,24 @@ ZEND_API zend_alloc_globals alloc_globals;
 
 # if MEMORY_LIMIT
 #  if ZEND_DEBUG
-#define CHECK_MEMORY_LIMIT(s, rs) _CHECK_MEMORY_LIMIT(s, rs, __zend_filename, __zend_lineno)
+#define CHECK_MEMORY_LIMIT(s) _CHECK_MEMORY_LIMIT(s,filename,lineno)
 #  else
-#define CHECK_MEMORY_LIMIT(s, rs)	_CHECK_MEMORY_LIMIT(s, rs, NULL,0)
+#define CHECK_MEMORY_LIMIT(s)	_CHECK_MEMORY_LIMIT(s,NULL,0)
 #  endif
 
-#define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
+#define _CHECK_MEMORY_LIMIT(s,file,lineno) { AG(allocated_memory) += (s);\
 								if (AG(memory_limit)<AG(allocated_memory)) {\
-									if ((AG(memory_limit)+1048576)<AG(allocated_memory)) { \
-										/* failed to handle this gracefully, exit() */ \
-										exit(1);	\
-									}	\
-									if (!AG(memory_exhausted)) {	\
-										if (!file) { \
-											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
-										} else { \
-											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", AG(memory_limit), file, lineno, s); \
-										} \
-										AG(memory_exhausted)=1;	\
-									}	\
+									if (!file) { \
+										zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
+									} else { \
+										zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", AG(memory_limit), file, lineno, s); \
+									} \
 								} \
 							}
 # endif
 
 #ifndef CHECK_MEMORY_LIMIT
-#define CHECK_MEMORY_LIMIT(s, rs)
+#define CHECK_MEMORY_LIMIT(s)
 #endif
 
 
@@ -104,135 +83,85 @@ ZEND_API zend_alloc_globals alloc_globals;
 		}							\
 		AG(head) = p;				\
 	}								\
-	p->pLast = (zend_mem_header *) NULL;
+	p->pLast = (mem_header *) NULL;
 
-#define DECLARE_CACHE_VARS		\
-	unsigned int real_size;		\
-	unsigned int cache_index;
 
-#define REAL_SIZE(size) ((size+7) & ~0x7)
+/* used by ISAPI and NSAPI */
 
-#define CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size)	\
-	real_size = REAL_SIZE(size);				\
-	cache_index = real_size >> 3;
-
-#define SIZE real_size
-
-#define CACHE_INDEX cache_index
-
-ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API void *_emalloc(size_t size, char *filename, uint lineno)
+#else
+ZEND_API void *_emalloc(size_t size)
+#endif
 {
-	zend_mem_header *p;
-	DECLARE_CACHE_VARS
-	ALS_FETCH();
-
-	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
-
-	if (!ZEND_DISABLE_MEMORY_CACHE && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] > 0)) {
-		p = AG(cache)[CACHE_INDEX][--AG(cache_count)[CACHE_INDEX]];
-#if ZEND_DEBUG
-		p->filename = __zend_filename;
-		p->lineno = __zend_lineno;
-		p->orig_filename = __zend_orig_filename;
-		p->orig_lineno = __zend_orig_lineno;
-		p->magic = MEM_BLOCK_START_MAGIC;
-		p->reported = 0;
-		/* Setting the thread id should not be necessary, because we fetched this block
-		 * from this thread's cache
-		 */
-		AG(cache_stats)[CACHE_INDEX][1]++;
-#endif
-		p->persistent = 0;
-		p->cached = 0;
-		p->size = size;
-		HANDLE_BLOCK_INTERRUPTIONS();
-		ADD_POINTER_TO_LIST(p);
-		HANDLE_UNBLOCK_INTERRUPTIONS();
-		return (void *)((char *)p + sizeof(zend_mem_header) + PLATFORM_PADDING);
-	} else {
-#if ZEND_DEBUG
-		if (CACHE_INDEX<MAX_CACHED_MEMORY) {
-			AG(cache_stats)[CACHE_INDEX][0]++;
-		}
-#endif
-		p  = (zend_mem_header *) malloc(sizeof(zend_mem_header) + SIZE + PLATFORM_PADDING + END_ALIGNMENT(SIZE) + END_MAGIC_SIZE);
-	}
+	mem_header *p;
 
 	HANDLE_BLOCK_INTERRUPTIONS();
 
-	if (!p) {
-		fprintf(stderr,"FATAL:  emalloc():  Unable to allocate %ld bytes\n", (long) size);
-#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
-		kill(getpid(), SIGSEGV);
-#else
-		exit(1);
+	if ((size < MAX_CACHED_MEMORY) && (AG(cache_count)[size] > 0)) {
+		p = AG(cache)[size][--AG(cache_count)[size]];
+#if ZEND_DEBUG
+		p->filename = filename;
+		p->lineno = lineno;
+		p->magic = MEM_BLOCK_START_MAGIC;
 #endif
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+		p->persistent = 0;
+		p->cached = 0;
+		return (void *)((char *)p + sizeof(mem_header) + PLATFORM_PADDING);
+	} else {
+		p  = (mem_header *) malloc(sizeof(mem_header) + size + PLATFORM_PADDING + END_ALIGNMENT(size) + END_MAGIC_SIZE);
+	}
+
+	if (!p) {
+		fprintf(stderr,"FATAL:  emalloc():  Unable to allocate %d bytes\n", size);
+		exit(1);
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (void *)p;
 	}
 	p->persistent = p->cached = 0;
 	ADD_POINTER_TO_LIST(p);
-	p->size = size; /* Save real size for correct cache output */
+	p->size = size;
 #if ZEND_DEBUG
-	p->filename = __zend_filename;
-	p->lineno = __zend_lineno;
-	p->orig_filename = __zend_orig_filename;
-	p->orig_lineno = __zend_orig_lineno;
+	p->filename = filename;
+	p->lineno = lineno;
 	p->magic = MEM_BLOCK_START_MAGIC;
-	p->reported = 0;
-# ifdef ZTS
-	p->thread_id = tsrm_thread_id();
-# endif
-	*((long *)(((char *) p) + sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE))) = MEM_BLOCK_END_MAGIC;
+	*((long *)(((char *) p) + sizeof(mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size))) = MEM_BLOCK_END_MAGIC;
 #endif
 #if MEMORY_LIMIT
-	CHECK_MEMORY_LIMIT(size, SIZE);
+	CHECK_MEMORY_LIMIT(size);
 #endif
 	HANDLE_UNBLOCK_INTERRUPTIONS();
-	return (void *)((char *)p + sizeof(zend_mem_header) + PLATFORM_PADDING);
+	return (void *)((char *)p + sizeof(mem_header) + PLATFORM_PADDING);
 }
 
 
-ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-{
-	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - PLATFORM_PADDING);
-	DECLARE_CACHE_VARS
-	ALS_FETCH();
-
-#if defined(ZTS) && ZEND_DEBUG
-	if (p->thread_id != tsrm_thread_id()) {
-		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x freed at %s:(%d) on thread %x, ignoring",
-			p->filename, p->lineno, p->thread_id,
-			__zend_filename, __zend_lineno, tsrm_thread_id());
-		return;
-	}
-#endif
-
-	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(p->size);
 #if ZEND_DEBUG
-	if (!_mem_block_check(ptr, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
-		return;
-	}
-	memset(ptr, 0x5a, SIZE);
+ZEND_API void _efree(void *ptr, char *filename, uint lineno)
+#else
+ZEND_API void _efree(void *ptr)
+#endif
+{
+	mem_header *p = (mem_header *) ((char *)ptr - sizeof(mem_header) - PLATFORM_PADDING);
+
+#if ZEND_DEBUG
+	_mem_block_check(ptr, 1, filename, lineno);
+	memset(ptr, 0x5a, p->size);
 #endif
 
-	if (!ZEND_DISABLE_MEMORY_CACHE 
-		&& !p->persistent && (CACHE_INDEX < MAX_CACHED_MEMORY) && (AG(cache_count)[CACHE_INDEX] < MAX_CACHED_ENTRIES)) {
-		AG(cache)[CACHE_INDEX][AG(cache_count)[CACHE_INDEX]++] = p;
+	if (!p->persistent && (p->size < MAX_CACHED_MEMORY) && (AG(cache_count)[p->size] < MAX_CACHED_ENTRIES)) {
+		AG(cache)[p->size][AG(cache_count)[p->size]++] = p;
 		p->cached = 1;
 #if ZEND_DEBUG
 		p->magic = MEM_BLOCK_CACHED_MAGIC;
 #endif
-		HANDLE_BLOCK_INTERRUPTIONS();
-		REMOVE_POINTER_FROM_LIST(p);
-		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return;
 	}
 	HANDLE_BLOCK_INTERRUPTIONS();
 	REMOVE_POINTER_FROM_LIST(p);
 
 #if MEMORY_LIMIT
-	AG(allocated_memory) -= SIZE;
+	AG(allocated_memory) -= p->size;
 #endif
 	
 	free(p);
@@ -240,90 +169,90 @@ ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 }
 
 
-ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API void *_ecalloc(size_t nmemb, size_t size, char *filename, uint lineno)
+#else
+ZEND_API void *_ecalloc(size_t nmemb, size_t size)
+#endif
 {
 	void *p;
 	int final_size=size*nmemb;
-	
+
 	HANDLE_BLOCK_INTERRUPTIONS();
-	p = _emalloc(final_size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+#if ZEND_DEBUG
+	p = _emalloc(final_size,filename,lineno);
+#else
+	p = emalloc(final_size);
+#endif
 	if (!p) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (void *) p;
 	}
-	memset(p,(int)NULL, final_size);
+	memset(p,(int)NULL,final_size);
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	return p;
 }
 
 
-ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API void *_erealloc(void *ptr, size_t size, char *filename, uint lineno)
+#else
+ZEND_API void *_erealloc(void *ptr, size_t size)
+#endif
 {
-	zend_mem_header *p = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-PLATFORM_PADDING);
-	zend_mem_header *orig = p;
-	DECLARE_CACHE_VARS
-	ALS_FETCH();
+	mem_header *p = (mem_header *) ((char *)ptr-sizeof(mem_header)-PLATFORM_PADDING);
+	mem_header *orig = p;
 
 	if (!ptr) {
-		return _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-	}
-
-#if defined(ZTS) && ZEND_DEBUG
-	if (p->thread_id != tsrm_thread_id()) {
-		void *new_p;
-
-		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x reallocated at %s:(%d) on thread %x, duplicating",
-			p->filename, p->lineno, p->thread_id,
-			__zend_filename, __zend_lineno, tsrm_thread_id());
-		new_p = _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-		memcpy(new_p, ptr, p->size);
-		return new_p;
-	}
+#if ZEND_DEBUG
+		return _emalloc(size, filename, lineno);
+#else
+		return emalloc(size);
 #endif
-
-	CALCULATE_REAL_SIZE_AND_CACHE_INDEX(size);
-
+	}
 	HANDLE_BLOCK_INTERRUPTIONS();
 	REMOVE_POINTER_FROM_LIST(p);
-	p = (zend_mem_header *) realloc(p,sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE)+END_MAGIC_SIZE);
+	p = (mem_header *) realloc(p,sizeof(mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size)+END_MAGIC_SIZE);
 	if (!p) {
-		if (!allow_failure) {
-			fprintf(stderr,"FATAL:  erealloc():  Unable to allocate %ld bytes\n", (long) size);
-#if ZEND_DEBUG && HAVE_KILL && HAVE_GETPID
-			kill(getpid(), SIGSEGV);
-#else
-			exit(1);
-#endif
-		}
-		ADD_POINTER_TO_LIST(orig);
+		fprintf(stderr,"FATAL:  erealloc():  Unable to allocate %d bytes\n", size);
 		HANDLE_UNBLOCK_INTERRUPTIONS();
+		zend_bailout();
+		ADD_POINTER_TO_LIST(orig);
 		return (void *)NULL;
 	}
 	ADD_POINTER_TO_LIST(p);
 #if ZEND_DEBUG
-	p->filename = __zend_filename;
-	p->lineno = __zend_lineno;
+	p->filename = filename;
+	p->lineno = lineno;
 	p->magic = MEM_BLOCK_START_MAGIC;
-	*((long *)(((char *) p) + sizeof(zend_mem_header)+SIZE+PLATFORM_PADDING+END_ALIGNMENT(SIZE))) = MEM_BLOCK_END_MAGIC;
+	*((long *)(((char *) p) + sizeof(mem_header)+size+PLATFORM_PADDING+END_ALIGNMENT(size))) = MEM_BLOCK_END_MAGIC;
 #endif	
 #if MEMORY_LIMIT
-	CHECK_MEMORY_LIMIT(size - p->size, SIZE - REAL_SIZE(p->size));
+	CHECK_MEMORY_LIMIT(size - p->size);
 #endif
 	p->size = size;
 
 	HANDLE_UNBLOCK_INTERRUPTIONS();
-	return (void *)((char *)p+sizeof(zend_mem_header)+PLATFORM_PADDING);
+	return (void *)((char *)p+sizeof(mem_header)+PLATFORM_PADDING);
 }
 
 
-ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API char *_estrdup(const char *s, char *filename, uint lineno)
+#else
+ZEND_API char *_estrdup(const char *s)
+#endif
 {
 	int length;
 	char *p;
 
 	length = strlen(s)+1;
 	HANDLE_BLOCK_INTERRUPTIONS();
-	p = (char *) _emalloc(length ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+#if ZEND_DEBUG
+	p = (char *) _emalloc(length,filename,lineno);
+#else
+	p = (char *) emalloc(length);
+#endif
 	if (!p) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (char *)NULL;
@@ -334,12 +263,20 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 }
 
 
-ZEND_API char *_estrndup(const char *s, uint length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API char *_estrndup(const char *s, uint length, char *filename, uint lineno)
+#else
+ZEND_API char *_estrndup(const char *s, uint length)
+#endif
 {
 	char *p;
 
 	HANDLE_BLOCK_INTERRUPTIONS();
-	p = (char *) _emalloc(length+1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+#if ZEND_DEBUG
+	p = (char *) _emalloc(length+1,filename,lineno);
+#else
+	p = (char *) emalloc(length+1);
+#endif
 	if (!p) {
 		HANDLE_UNBLOCK_INTERRUPTIONS();
 		return (char *)NULL;
@@ -380,13 +317,8 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
 }
 
 
-ZEND_API void start_memory_manager(ALS_D)
+ZEND_API void start_memory_manager(void)
 {
-#ifndef ZTS
-	int i, j;
-	void *cached_entries[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
-#endif
-
 	AG(phead) = AG(head) = NULL;
 	
 #if MEMORY_LIMIT
@@ -395,83 +327,25 @@ ZEND_API void start_memory_manager(ALS_D)
 	AG(memory_exhausted)=0;
 #endif
 
-	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
-	memset(AG(cache_count),0,sizeof(AG(cache_count)));
-
-#ifndef ZTS
-	/* Initialize cache, to prevent fragmentation */
-	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
-	 * will yield an endless recursion calling to alloc_globals_ctor()
-	 */
-	for (i=1; i<MAX_CACHED_MEMORY; i++) {
-		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
-			cached_entries[i][j] = emalloc(8*i);
-		}
-	}
-	for (i=1; i<MAX_CACHED_MEMORY; i++) {
-		for (j=0; j<PRE_INIT_CACHE_ENTRIES; j++) {
-			efree(cached_entries[i][j]);
-		}
-	}
-#endif
-
-#if ZEND_DEBUG
-	memset(AG(cache_stats), 0, sizeof(AG(cache_stats)));
-	memset(AG(fast_cache_stats), 0, sizeof(AG(fast_cache_stats)));
-#endif
+	memset(AG(cache_count),0,MAX_CACHED_MEMORY*sizeof(unsigned char));
 }
 
 
 ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 {
-	zend_mem_header *p, *t;
-	unsigned int fci, i, j;
-#if ZEND_DEBUG
-	int had_leaks=0;
-#endif
-	zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
-	ALS_FETCH();
-
-	for (fci=0; fci<MAX_FAST_CACHE_TYPES; fci++) {
-		fast_cache_list_entry = AG(fast_cache_list_head)[fci];
-		while (fast_cache_list_entry) {
-			next_fast_cache_list_entry = fast_cache_list_entry->next;
-			efree(fast_cache_list_entry);
-			fast_cache_list_entry = next_fast_cache_list_entry;
-		}
-		AG(fast_cache_list_head)[fci] = NULL;
-	}
+	mem_header *p, *t;
 
 	p=AG(head);
 	t=AG(head);
 	while (t) {
 		if (!t->cached || clean_cache) {
 #if ZEND_DEBUG
-			if (!t->cached && !t->reported) {
-				zend_mem_header *iterator;
-				int total_leak=0, total_leak_count=0;
-
-				had_leaks=1;
+			if (!t->cached) {
+				/* does not use zend_error() *intentionally* */
 				if (!silent) {
 					zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, t);
 				}
-				t->reported = 1;
-				for (iterator=t->pNext; iterator; iterator=iterator->pNext) {
-					if (!iterator->cached
-						&& iterator->filename==t->filename
-						&& iterator->lineno==t->lineno) {
-						total_leak += iterator->size;
-						total_leak_count++;
-						iterator->reported = 1;
-					}
-				}
-				if (!silent && total_leak_count>0) {
-					zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *) (long) (total_leak_count));
-				}
 			}
-#endif
-#if MEMORY_LIMIT
-			AG(allocated_memory) -= t->size;
 #endif
 			p = t->pNext;
 			REMOVE_POINTER_FROM_LIST(t);
@@ -481,81 +355,13 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 			t = t->pNext;
 		}
 	}
-
-	if(clean_cache) {
-		for (i=1; i<MAX_CACHED_MEMORY; i++) {
-			for (j=0; j<AG(cache_count)[i]; j++) {
-				free(AG(cache)[i][j]);
-			}
-		}
-	}
-#if MEMORY_LIMIT
-	AG(memory_exhausted)=0;
-#endif
-
-#if (ZEND_DEBUG)
-	do {
-		zval display_memory_cache_stats;
-		int i, j;
-
-		if (clean_cache) {
-			/* we're shutting down completely, don't even touch the INI subsystem */
-			break;
-		}
-		if (zend_get_configuration_directive("display_memory_cache_stats", sizeof("display_memory_cache_stats"), &display_memory_cache_stats)==FAILURE) {
-			break;
-		}
-		if (!atoi(display_memory_cache_stats.value.str.val)) {
-			break;
-		}
-		fprintf(stderr, "Memory cache statistics\n"
-						"-----------------------\n\n"
-						"[zval, %2ld]\t\t%d / %d (%.2f%%)\n"
-						"[hash, %2ld]\t\t%d / %d (%.2f%%)\n",
-						(long) sizeof(zval),
-						AG(fast_cache_stats)[ZVAL_CACHE_LIST][1], AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1],
-						((double) AG(fast_cache_stats)[ZVAL_CACHE_LIST][1] / (AG(fast_cache_stats)[ZVAL_CACHE_LIST][0]+AG(fast_cache_stats)[ZVAL_CACHE_LIST][1]))*100,
-						(long) sizeof(HashTable),
-						AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1], AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1],
-						((double) AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1] / (AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][0]+AG(fast_cache_stats)[HASHTABLE_CACHE_LIST][1]))*100);
-
-
-		for (i=0; i<MAX_CACHED_MEMORY; i+=2) {
-			fprintf(stderr, "[%2d, %2d]\t\t", i, i+1);
-			for (j=0; j<2; j++) {
-				fprintf(stderr, "%d / %d (%.2f%%)\t\t",
-						AG(cache_stats)[i+j][1], AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1],
-						((double) AG(cache_stats)[i+j][1] / (AG(cache_stats)[i+j][0]+AG(cache_stats)[i+j][1]))*100);
-			}
-			fprintf(stderr, "\n");
-		}
-					
-	} while (0);
-#endif
 }
 
 
 #if ZEND_DEBUG
-void zend_debug_alloc_output(char *format, ...)
+ZEND_API int _mem_block_check(void *ptr, int silent, char *filename, int lineno)
 {
-	char output_buf[256];
-	va_list args;
-
-	va_start(args, format);
-	vsprintf(output_buf, format, args);
-	va_end(args);
-
-#ifdef ZEND_WIN32
-	OutputDebugString(output_buf);
-#else
-	fprintf(stderr, "%s", output_buf);
-#endif
-}
-
-
-ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-{
-	zend_mem_header *p = (zend_mem_header *) ((char *)ptr - sizeof(zend_mem_header) - PLATFORM_PADDING);
+	mem_header *p = (mem_header *) ((char *)ptr - sizeof(mem_header) - PLATFORM_PADDING);
 	int no_cache_notice=0;
 	int valid_beginning=1;
 	int had_problems=0;
@@ -569,46 +375,42 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 		no_cache_notice=1;
 	}
 	if (!silent) {
-		zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL);
-		zend_debug_alloc_output("---------------------------------------\n");
-		zend_debug_alloc_output("%s(%d) : Block 0x%0.8lX status:\n" ZEND_FILE_LINE_RELAY_CC, (long) p);
-		if (__zend_orig_filename) {
-			zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC);
-		}
-		zend_debug_alloc_output("%10s\t","Beginning:  ");
+		fprintf(stderr,"---------------------------------------\n");
+		fprintf(stderr,"Block 0x%0.8lX status at %s:%d:\n", (long) p, filename, lineno);
+		fprintf(stderr,"%10s\t","Beginning:  ");
 	}
 
 	switch (p->magic) {
 		case MEM_BLOCK_START_MAGIC:
 			if (!silent) {
-				zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+				fprintf(stderr, "OK (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
 			}
 			break; /* ok */
 		case MEM_BLOCK_FREED_MAGIC:
 			if (!silent) {
-				zend_debug_alloc_output("Freed\n");
+				fprintf(stderr,"Freed\n");
 				had_problems=1;
 			} else {
-				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+				return _mem_block_check(ptr, 0, filename, lineno);
 			}
 			break;
 		case MEM_BLOCK_CACHED_MAGIC:
 			if (!silent) {
 				if (!no_cache_notice) {
-					zend_debug_alloc_output("Cached (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
+					fprintf(stderr,"Cached (allocated on %s:%d, %d bytes)\n", p->filename, p->lineno, p->size);
 					had_problems=1;
 				}
 			} else {
 				if (!no_cache_notice) {
-					return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+					return _mem_block_check(ptr, 0, filename, lineno);
 				}
 			}
 			break;
 		default:
 			if (!silent) {
-				zend_debug_alloc_output("Overrun (magic=0x%0.8lX, expected=0x%0.8lX)\n", p->magic, MEM_BLOCK_START_MAGIC);
+				fprintf(stderr,"Overrun (magic=0x%0.8lX, expected=0x%0.8lX)\n", p->magic, MEM_BLOCK_START_MAGIC);
 			} else {
-				return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+				return _mem_block_check(ptr, 0, filename, lineno);
 			}
 			had_problems=1;
 			valid_beginning=0;
@@ -617,17 +419,17 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 
 
 	if (valid_beginning
-		&& *((long *)(((char *) p)+sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING+END_ALIGNMENT(REAL_SIZE(p->size)))) != MEM_BLOCK_END_MAGIC) {
+		&& *((long *)(((char *) p)+sizeof(mem_header)+p->size+PLATFORM_PADDING+END_ALIGNMENT(p->size))) != MEM_BLOCK_END_MAGIC) {
 		long magic_num = MEM_BLOCK_END_MAGIC;
 		char *overflow_ptr, *magic_ptr=(char *) &magic_num;
 		int overflows=0;
 		int i;
 
 		if (silent) {
-			return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+			return _mem_block_check(ptr, 0, filename, lineno);
 		}
 		had_problems=1;
-		overflow_ptr = ((char *) p)+sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING;
+		overflow_ptr = ((char *) p)+sizeof(mem_header)+p->size+PLATFORM_PADDING;
 
 		for (i=0; i<sizeof(long); i++) {
 			if (overflow_ptr[i]!=magic_ptr[i]) {
@@ -635,72 +437,63 @@ ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_
 			}
 		}
 
-		zend_debug_alloc_output("%10s\t", "End:");
-		zend_debug_alloc_output("Overflown (magic=0x%0.8lX instead of 0x%0.8lX)\n", 
-				*((long *)(((char *) p) + sizeof(zend_mem_header)+REAL_SIZE(p->size)+PLATFORM_PADDING+END_ALIGNMENT(REAL_SIZE(p->size)))), MEM_BLOCK_END_MAGIC);
-		zend_debug_alloc_output("%10s\t","");
+		fprintf(stderr,"%10s\t", "End:");
+		fprintf(stderr,"Overflown (magic=0x%0.8lX instead of 0x%0.8lX)\n", 
+				*((long *)(((char *) p) + sizeof(mem_header)+p->size+PLATFORM_PADDING+END_ALIGNMENT(p->size))), MEM_BLOCK_END_MAGIC);
+		fprintf(stderr,"%10s\t","");
 		if (overflows>=sizeof(long)) {
-			zend_debug_alloc_output("At least %d bytes overflown\n", sizeof(long));
+			fprintf(stderr, "At least %d bytes overflown\n", sizeof(long));
 		} else {
-			zend_debug_alloc_output("%d byte(s) overflown\n", overflows);
+			fprintf(stderr, "%d byte(s) overflown\n", overflows);
 		}
 	} else if (!silent) {
-		zend_debug_alloc_output("%10s\t", "End:");
+		fprintf(stderr,"%10s\t", "End:");
 		if (valid_beginning) {
-			zend_debug_alloc_output("OK\n");
+			fprintf(stderr,"OK\n");
 		} else {
-			zend_debug_alloc_output("Unknown\n");
+			fprintf(stderr,"Unknown\n");
 		}
 	}
-
-	if (had_problems) {
-		int foo = 5;
-
-		foo+=1;
-	}
 		
 	if (!silent) {
-		zend_debug_alloc_output("---------------------------------------\n");
+		fprintf(stderr,"---------------------------------------\n");
 	}
 	return ((!had_problems) ? 1 : 0);
 }
 
 
-ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+ZEND_API void _full_mem_check(int silent, char *filename, uint lineno)
 {
-	zend_mem_header *p;
+	mem_header *p = AG(head);
 	int errors=0;
-	ALS_FETCH();
 
-	p = AG(head);
-	
-
-	zend_debug_alloc_output("------------------------------------------------\n");
-	zend_debug_alloc_output("Full Memory Check at %s:%d\n" ZEND_FILE_LINE_RELAY_CC);
+	fprintf(stderr,"------------------------------------------------\n");
+	fprintf(stderr,"Full Memory Check at %s:%d\n", filename, lineno);
 
 	while (p) {
-		if (!_mem_block_check((void *)((char *)p + sizeof(zend_mem_header) + PLATFORM_PADDING), (silent?2:3) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
+		if (!_mem_block_check((void *)((char *)p + sizeof(mem_header) + PLATFORM_PADDING), (silent?2:3), filename, lineno)) {
 			errors++;
 		}
 		p = p->pNext;
 	}
-	zend_debug_alloc_output("End of full memory check %s:%d (%d errors)\n" ZEND_FILE_LINE_RELAY_CC, errors);
-	zend_debug_alloc_output("------------------------------------------------\n");
+	fprintf(stderr,"End of full memory check %s:%d (%d errors)\n", filename, lineno, errors);
+	fprintf(stderr,"------------------------------------------------\n");
 }
 #endif
 
 
-ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+#if ZEND_DEBUG
+ZEND_API void _persist_alloc(void *ptr, char *filename, uint lineno)
+#else
+ZEND_API void _persist_alloc(void *ptr)
+#endif
 {
-	zend_mem_header *p = (zend_mem_header *) ((char *)ptr-sizeof(zend_mem_header)-PLATFORM_PADDING);
-	ALS_FETCH();
+	mem_header *p = (mem_header *) ((char *)ptr-sizeof(mem_header)-PLATFORM_PADDING);
 
 #if ZEND_DEBUG
-	_mem_block_check(ptr, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+	_mem_block_check(ptr, 1, filename, lineno);
 #endif
 
-	HANDLE_BLOCK_INTERRUPTIONS();
-
 	/* remove the block from the non persistent list */
 	REMOVE_POINTER_FROM_LIST(p);
 
@@ -708,8 +501,6 @@ ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 
 	/* add the block to the persistent list */
 	ADD_POINTER_TO_LIST(p);
-	HANDLE_UNBLOCK_INTERRUPTIONS();
-	return REAL_SIZE(p->size)+sizeof(zend_mem_header)+PLATFORM_PADDING;
 }
 
 

Zend/zend_alloc.h

@@ -2,114 +2,91 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_ALLOC_H
-#define ZEND_ALLOC_H
+#ifndef _ALLOC_H
+#define _ALLOC_H
 
 #include <stdio.h>
 
-#ifdef ZTS
-#include "../TSRM/TSRM.h"
-#endif
-
-#include "zend_globals_macros.h"
-
 #define MEM_BLOCK_START_MAGIC	0x7312F8DCL
-#define MEM_BLOCK_END_MAGIC	0x2A8FCC84L
+#define MEM_BLOCK_END_MAGIC		0x2A8FCC84L
 #define MEM_BLOCK_FREED_MAGIC	0x99954317L
 #define MEM_BLOCK_CACHED_MAGIC	0xFB8277DCL
 
-typedef struct _zend_mem_header {
+typedef struct _mem_header {
 #if ZEND_DEBUG
 	long magic;
 	char *filename;
 	uint lineno;
-	int reported;
-	char *orig_filename;
-	uint orig_lineno;
-# ifdef ZTS
-	THREAD_T thread_id;
-# endif
 #endif
-    struct _zend_mem_header *pNext;
-    struct _zend_mem_header *pLast;
+    struct _mem_header *pNext;
+    struct _mem_header *pLast;
 	unsigned int size:30;
 	unsigned int persistent:1;
 	unsigned int cached:1;
-} zend_mem_header;
+} mem_header;
 
-typedef union _align_test {
+typedef union {
 	void *ptr;
 	double dbl;
 	long lng;
 } align_test;
 
-#define MAX_CACHED_MEMORY	11
-#define MAX_CACHED_ENTRIES	256
-#define PRE_INIT_CACHE_ENTRIES	32
+#define MAX_CACHED_MEMORY   64
+#define MAX_CACHED_ENTRIES	16
 
-#if (defined (__GNUC__) && __GNUC__ >= 2)
-#define PLATFORM_ALIGNMENT (__alignof__ (align_test))
-#else
 #define PLATFORM_ALIGNMENT (sizeof(align_test))
-#endif
-
-#define PLATFORM_PADDING (((PLATFORM_ALIGNMENT-sizeof(zend_mem_header))%PLATFORM_ALIGNMENT+PLATFORM_ALIGNMENT)%PLATFORM_ALIGNMENT)
-
-
-BEGIN_EXTERN_C()
+#define PLATFORM_PADDING (((PLATFORM_ALIGNMENT-sizeof(mem_header))%PLATFORM_ALIGNMENT+PLATFORM_ALIGNMENT)%PLATFORM_ALIGNMENT)
 
 ZEND_API char *zend_strndup(const char *s, unsigned int length);
 
-ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
+#if ZEND_DEBUG
+ZEND_API void *_emalloc(size_t size,char *filename,uint lineno);
+ZEND_API void _efree(void *ptr,char *filename,uint lineno);
+ZEND_API void *_ecalloc(size_t nmemb, size_t size,char *filename,uint lineno);
+ZEND_API void *_erealloc(void *ptr, size_t size,char *filename,uint lineno);
+ZEND_API char *_estrdup(const char *s,char *filename,uint lineno);
+ZEND_API char *_estrndup(const char *s, unsigned int length,char *filename,uint lineno);
+ZEND_API void _persist_alloc(void *ptr, char *filename, uint lineno);
+#define emalloc(size)			_emalloc((size),__FILE__,__LINE__)
+#define efree(ptr)				_efree((ptr),__FILE__,__LINE__)
+#define ecalloc(nmemb,size)		_ecalloc((nmemb),(size),__FILE__,__LINE__)
+#define erealloc(ptr,size)		_erealloc((ptr),(size),__FILE__,__LINE__)
+#define estrdup(s)				_estrdup((s),__FILE__,__LINE__)
+#define estrndup(s,length)		_estrndup((s),(length),__FILE__,__LINE__)
+#define persist_alloc(p)		_persist_alloc((p),__FILE__,__LINE__)
+#else
+ZEND_API void *_emalloc(size_t size);
+ZEND_API void _efree(void *ptr);
+ZEND_API void *_ecalloc(size_t nmemb, size_t size);
+ZEND_API void *_erealloc(void *ptr, size_t size);
+ZEND_API char *_estrdup(const char *s);
+ZEND_API char *_estrndup(const char *s, unsigned int length);
+ZEND_API void _persist_alloc(void *ptr);
+#define emalloc(size)			_emalloc((size))
+#define efree(ptr)				_efree((ptr))
+#define ecalloc(nmemb,size)		_ecalloc((nmemb),(size))
+#define erealloc(ptr,size)		_erealloc((ptr),(size))
+#define estrdup(s)				_estrdup((s))
+#define estrndup(s,length)		_estrndup((s),(length))
+#define persist_alloc(p)		_persist_alloc((p))
+#endif
 
-/* Standard wrapper macros */
-#define emalloc(size)					_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define efree(ptr)						_efree((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define ecalloc(nmemb,size)				_ecalloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define erealloc(ptr,size)				_erealloc((ptr), (size),0 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define erealloc_recoverable(ptr,size)	_erealloc((ptr), (size),1 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define estrdup(s)						_estrdup((s) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define estrndup(s,length)				_estrndup((s), (length) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define persist_alloc(p)				_persist_alloc((p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-
-/* Relay wrapper macros */
-#define emalloc_rel(size)					_emalloc((size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define efree_rel(ptr)						_efree((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define ecalloc_rel(nmemb, size)			_ecalloc((nmemb), (size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define erealloc_rel(ptr, size)				_erealloc((ptr), (size), 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define erealloc_recoverable_rel(ptr, size)	_erealloc((ptr), (size), 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define estrdup_rel(s)						_estrdup((s) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define estrndup_rel(s, length)				_estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-#define persist_alloc_rel(p)				_persist_alloc((p) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC)
-
-/* Selective persistent/non persistent allocation macros */
 #define pemalloc(size,persistent) ((persistent)?malloc(size):emalloc(size))
 #define pefree(ptr,persistent)  ((persistent)?free(ptr):efree(ptr))
 #define pecalloc(nmemb,size,persistent) ((persistent)?calloc((nmemb),(size)):ecalloc((nmemb),(size)))
 #define perealloc(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc((ptr),(size)))
-#define perealloc_recoverable(ptr,size,persistent) ((persistent)?realloc((ptr),(size)):erealloc_recoverable((ptr),(size)))
 #define pestrdup(s,persistent) ((persistent)?strdup(s):estrdup(s))
 
 #define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):(empty_string))
@@ -117,23 +94,21 @@ ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 
 ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
 
-ZEND_API void start_memory_manager(ALS_D);
+ZEND_API void start_memory_manager(void);
 ZEND_API void shutdown_memory_manager(int silent, int clean_cache);
 
 #if ZEND_DEBUG
-ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-ZEND_API void _full_mem_check(int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void zend_debug_alloc_output(char *format, ...);
-#define mem_block_check(ptr, silent) _mem_block_check(ptr, silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define full_mem_check(silent) _full_mem_check(silent ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+ZEND_API int _mem_block_check(void *ptr, int silent, char *filename, int lineno);
+ZEND_API void _full_mem_check(int silent, char *filename, uint lineno);
+#define mem_block_check(ptr, silent) _mem_block_check(ptr, silent, __FILE__, __LINE__)
+#define mem_block_check(ptr, silent) _mem_block_check(ptr, silent, __FILE__, __LINE__)
+#define full_mem_check(silent) _full_mem_check(silent, __FILE__, __LINE__)
 #else
 #define mem_block_check(type, ptr, silent)
 #define full_mem_check(silent)
 #endif
 
 
-END_EXTERN_C()
-
 #endif
 
 /*

Zend/zend_builtin_functions.h

@@ -1,26 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_BUILTIN_FUNCTIONS_H
-#define ZEND_BUILTIN_FUNCTIONS_H
-
-int zend_startup_builtin_functions(void);
-
-#endif /* ZEND_BUILTIN_FUNCTIONS_H */

Zend/zend_compile.h

@@ -2,49 +2,32 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_COMPILE_H
-#define ZEND_COMPILE_H
+#ifndef _COMPILE_H
+#define _COMPILE_H
 
 #include "zend.h"
-
-#ifdef HAVE_STDARG_H
-# include <stdarg.h>
-#endif
-
-#ifdef __cplusplus
-#include <iostream.h>
-#endif
-
 #include "zend_llist.h"
+#define YYSTYPE znode
+#include "zend-parser.h"
 
 #define DEBUG_ZEND 0
-
-#ifndef ZTS
-# define SUPPORT_INTERACTIVE 1
-#else
-# define SUPPORT_INTERACTIVE 0
-#endif
+#define SUPPORT_INTERACTIVE 1
 
 #define FREE_PNODE(znode)	zval_dtor(&znode->u.constant);
 #define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);
 
-#define SET_UNUSED(op)  (op).op_type = IS_UNUSED
 
 #if SUPPORT_INTERACTIVE
 #define INC_BPC(op_array)	((op_array)->backpatch_count++)
@@ -58,34 +41,33 @@
 
 typedef struct _zend_op_array zend_op_array;
 
-typedef struct _znode {
+typedef struct {
 	int op_type;
 	union {
 		zval constant;
 
-		zend_uint var;
-		zend_uint opline_num; /*  Needs to be signed */
-		zend_uint fetch_type;
+		int var;
+		int opline_num;
 		zend_op_array *op_array;
 		struct {
-			zend_uint var;	/* dummy */
-			zend_uint type;
+			int var;	/* dummy */
+			int type;
 		} EA;
 	} u;
 } znode;
 
 
 typedef struct _zend_op {
-	zend_uchar opcode;
+	int opcode;
 	znode result;
 	znode op1;
 	znode op2;
-	ulong extended_value;
+	char *filename;
 	uint lineno;
 } zend_op;
 
 
-typedef struct _zend_brk_cont_element {
+typedef struct {
 	int cont;
 	int brk;
 	int parent;
@@ -93,22 +75,23 @@ typedef struct _zend_brk_cont_element {
 
 
 struct _zend_op_array {
-	zend_uchar type;	/* MUST be the first element of this struct! */
+	int type;	/* MUST be the first element of this struct! */
 
-	zend_uchar *arg_types;		/* MUST be the second element of this struct! */
-	char *function_name;			/* MUST be the third element of this struct! */
+	unsigned char *arg_types;		/* MUST be the second element of this struct! */
 
-	zend_uint *refcount;
+	int *refcount;
 
 	zend_op *opcodes;
-	zend_uint last, size;
+	int last, size;
 
-	zend_uint T;
+	int T;
+
+	char *function_name;
 
 	zend_brk_cont_element *brk_cont_array;
-	zend_uint last_brk_cont;
-	zend_uint current_brk_cont;
-	zend_bool uses_globals;
+	int last_brk_cont;
+	int current_brk_cont;
+	unsigned char initialized_globals;
 
 	/* static variables support */
 	HashTable *static_variables;
@@ -118,74 +101,57 @@ struct _zend_op_array {
 	int last_executed_op_number;
 	int backpatch_count;
 #endif
-	zend_bool return_reference;
-	zend_bool done_pass_two;
 
-	char *filename;
-
-	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+	void *reserved[4];
 };
 
 
-typedef struct _zend_internal_function {
-	zend_uchar type;	/* MUST be the first element of this struct! */
+typedef struct {
+	int type;	/* MUST be the first element of this struct! */
 
-	zend_uchar *arg_types;		/* MUST be the second element of this struct */
-	char *function_name;			/* MUST be the third element of this struct */
+	unsigned char *arg_types;		/* MUST be the second element of this struct */
 
 	void (*handler)(INTERNAL_FUNCTION_PARAMETERS);
+	char *function_name;
 } zend_internal_function;
 
 
-typedef struct _zend_overloaded_function {
-	zend_uchar type;	/* MUST be the first element of this struct! */
-
-	zend_uchar *arg_types;		/* MUST be the second element of this struct */
-	char *function_name;		/* MUST be the third element of this struct */
-
-	zend_uint var;
-} zend_overloaded_function;
-
-
-typedef union _zend_function {
-	zend_uchar type;	/* MUST be the first element of this struct! */
+typedef union {
+	int type;	/* MUST be the first element of this struct! */
 	struct {
-		zend_uchar type;  /* never used */
-		zend_uchar *arg_types;
-		char *function_name;
+		int type;  /* never used */
+		unsigned char *arg_types;
 	} common;
 	
 	zend_op_array op_array;
 	zend_internal_function internal_function;
-	zend_overloaded_function overloaded_function;
 } zend_function;
 
 
-typedef struct _zend_function_state {
+typedef struct {
 	HashTable *function_symbol_table;
 	zend_function *function;
-	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
+	void *reserved[4];
 } zend_function_state;
 
 
-typedef struct _zend_switch_entry {
+typedef struct {
 	znode cond;
 	int default_case;
 	int control_var;
 } zend_switch_entry;
 
 
-typedef struct _list_llist_element {
+typedef struct {
 	znode var;
 	zend_llist dimensions;
 	znode value;
 } list_llist_element;
 
 
-typedef struct _zend_file_handle {
-	zend_uchar type;
+typedef struct {
+	int type;
 	char *filename;
-	char *opened_path;
 	union {
 		int fd;
 		FILE *fp;
@@ -193,10 +159,10 @@ typedef struct _zend_file_handle {
 		istream *is;
 #endif
 	} handle;
-	zend_bool free_filename;
 } zend_file_handle;
 
 
+#include "zend_globals.h"
 
 #define IS_CONST	(1<<0)
 #define IS_TMP_VAR	(1<<1)
@@ -206,205 +172,172 @@ typedef struct _zend_file_handle {
 
 #define EXT_TYPE_UNUSED		(1<<0)
 
-#include "zend_globals.h"
-
-BEGIN_EXTERN_C()
-
 void init_compiler(CLS_D ELS_DC);
 void shutdown_compiler(CLS_D);
 
-extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type CLS_DC);
-
-void zend_activate(CLS_D ELS_DC);
-void zend_deactivate(CLS_D ELS_DC);
-void zend_activate_modules(void);
-void zend_deactivate_modules(void);
-
+extern zend_op_array *(*zend_compile_files)(int mark_as_ref CLS_DC, int file_count, ...);
 
 int lex_scan(zval *zendlval CLS_DC);
+void reset_scanner(CLS_D);
 void startup_scanner(CLS_D);
 void shutdown_scanner(CLS_D);
 
-ZEND_API char *zend_set_compiled_filename(char *new_compiled_filename);
+ZEND_API void zend_set_compiled_filename(char *new_compiled_filename);
 ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename);
-ZEND_API char *zend_get_compiled_filename(CLS_D);
-ZEND_API int zend_get_compiled_lineno(CLS_D);
-
-#ifdef ZTS
-const char *zend_get_zendtext(CLS_D);
-int zend_get_zendleng(CLS_D);
-#endif
+ZEND_API char *zend_get_compiled_filename();
 
 
 /* parser-driven code generators */
-void zend_do_binary_op(int op, znode *result, znode *op1, znode *op2 CLS_DC);
-void zend_do_unary_op(int op, znode *result, znode *op1 CLS_DC);
-void zend_do_binary_assign_op(int op, znode *result, znode *op1, znode *op2 CLS_DC);
-void zend_do_assign(znode *result, znode *variable, znode *value CLS_DC);
-void zend_do_assign_ref(znode *result, znode *lvar, znode *rvar CLS_DC);
+void do_binary_op(int op, znode *result, znode *op1, znode *op2 CLS_DC);
+void do_unary_op(int op, znode *result, znode *op1 CLS_DC);
+void do_binary_assign_op(int op, znode *result, znode *op1, znode *op2 CLS_DC);
+void do_assign(znode *result, znode *variable, znode *value CLS_DC);
+void do_assign_ref(znode *result, znode *lvar, znode *rvar CLS_DC);
 void fetch_simple_variable(znode *result, znode *varname, int bp CLS_DC);
-void fetch_simple_variable_ex(znode *result, znode *varname, int bp, int op CLS_DC);
-void zend_do_indirect_references(znode *result, znode *num_references, znode *variable CLS_DC);
-void zend_do_fetch_global_or_static_variable(znode *varname, znode *static_assignment, int fetch_type CLS_DC);
-void zend_do_fetch_globals(znode *varname CLS_DC);
+void do_indirect_references(znode *result, znode *num_references, znode *variable CLS_DC);
+void do_fetch_global_or_static_variable(znode *varname, znode *static_assignment, int fetch_type CLS_DC);
+void do_fetch_globals(znode *varname);
 
 void fetch_array_begin(znode *result, znode *varname, znode *first_dim CLS_DC);
 void fetch_array_dim(znode *result, znode *parent, znode *dim CLS_DC);
-void fetch_string_offset(znode *result, znode *parent, znode *offset CLS_DC);
-void zend_do_print(znode *result, znode *arg CLS_DC);
-void zend_do_echo(znode *arg CLS_DC);
-typedef int (*unary_op_type)(zval *, zval *);
-ZEND_API unary_op_type get_unary_op(int opcode);
+void do_print(znode *result, znode *arg CLS_DC);
+void do_echo(znode *arg CLS_DC);
+ZEND_API void *get_unary_op(int opcode);
 ZEND_API void *get_binary_op(int opcode);
 
-void zend_do_while_cond(znode *expr, znode *close_bracket_token CLS_DC);
-void zend_do_while_end(znode *while_token, znode *close_bracket_token CLS_DC);
-void zend_do_do_while_begin(CLS_D);
-void zend_do_do_while_end(znode *do_token, znode *expr_open_bracket, znode *expr CLS_DC);
+void do_while_cond(znode *expr, znode *close_bracket_token CLS_DC);
+void do_while_end(znode *while_token, znode *close_bracket_token CLS_DC);
+void do_do_while_begin(CLS_D);
+void do_do_while_end(znode *do_token, znode *expr CLS_DC);
 
 
-void zend_do_if_cond(znode *cond, znode *closing_bracket_token CLS_DC);
-void zend_do_if_after_statement(znode *closing_bracket_token, unsigned char initialize CLS_DC);
-void zend_do_if_end(CLS_D);
+void do_if_cond(znode *cond, znode *closing_bracket_token CLS_DC);
+void do_if_after_statement(znode *closing_bracket_token, unsigned char initialize CLS_DC);
+void do_if_end(CLS_D);
 
-void zend_do_for_cond(znode *expr, znode *second_semicolon_token CLS_DC);
-void zend_do_for_before_statement(znode *cond_start, znode *second_semicolon_token CLS_DC);
-void zend_do_for_end(znode *second_semicolon_token CLS_DC);
+void do_for_cond(znode *expr, znode *second_semicolon_token CLS_DC);
+void do_for_before_statement(znode *cond_start, znode *second_semicolon_token CLS_DC);
+void do_for_end(znode *second_semicolon_token CLS_DC);
 
-void zend_do_pre_incdec(znode *result, znode *op1, int op CLS_DC);
-void zend_do_post_incdec(znode *result, znode *op1, int op CLS_DC);
+void do_pre_incdec(znode *result, znode *op1, int op CLS_DC);
+void do_post_incdec(znode *result, znode *op1, int op CLS_DC);
 
-void zend_do_begin_variable_parse(CLS_D);
-void zend_do_end_variable_parse(int type, int arg_offset CLS_DC);
+void do_begin_variable_parse(CLS_D);
+void do_end_variable_parse(int type CLS_DC);
 
-void zend_do_free(znode *op1 CLS_DC);
+void do_free(znode *op1 CLS_DC);
 
-void zend_do_init_string(znode *result CLS_DC);
-void zend_do_add_char(znode *result, znode *op1, znode *op2 CLS_DC);
-void zend_do_add_string(znode *result, znode *op1, znode *op2 CLS_DC);
-void zend_do_add_variable(znode *result, znode *op1, znode *op2 CLS_DC);
+void do_init_string(znode *result);
+void do_add_char(znode *result, znode *op1, znode *op2 CLS_DC);
+void do_add_string(znode *result, znode *op1, znode *op2 CLS_DC);
+void do_add_variable(znode *result, znode *op1, znode *op2 CLS_DC);
 
-void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference CLS_DC);
-void zend_do_end_function_declaration(znode *function_token CLS_DC);
-void zend_do_receive_arg(int op, znode *var, znode *offset, znode *initialization, unsigned char pass_type CLS_DC);
-int zend_do_begin_function_call(znode *function_name CLS_DC);
-void zend_do_begin_dynamic_function_call(znode *function_name CLS_DC);
-void zend_do_begin_class_member_function_call(znode *class_name, znode *function_name CLS_DC);
-void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall CLS_DC);
-void zend_do_return(znode *expr, int do_end_vparse CLS_DC);
-ZEND_API int do_bind_function_or_class(zend_op *opline, HashTable *function_table, HashTable *class_table, int compile_time);
-void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce);
-void zend_do_early_binding(CLS_D);
+void do_begin_function_declaration(znode *function_token, znode *function_name, int is_method CLS_DC);
+void do_end_function_declaration(znode *function_token CLS_DC);
+void do_receive_arg(int op, znode *var, znode *offset, znode *initialization, unsigned char pass_type CLS_DC);
+void do_begin_function_call(znode *function_name CLS_DC);
+void do_begin_dynamic_function_call(znode *function_name CLS_DC);
+void do_begin_class_member_function_call(znode *class_name, znode *function_name CLS_DC);
+void do_end_function_call(znode *function_name, znode *result, int is_method CLS_DC);
+void do_return(znode *expr CLS_DC);
 
-void zend_do_pass_param(znode *param, int op, int offset CLS_DC);
+void do_pass_param(znode *param, int op, int offset CLS_DC);
 
 
-void zend_do_boolean_or_begin(znode *expr1, znode *op_token CLS_DC);
-void zend_do_boolean_or_end(znode *result, znode *expr1, znode *expr2, znode *op_token CLS_DC);
-void zend_do_boolean_and_begin(znode *expr1, znode *op_token CLS_DC);               
-void zend_do_boolean_and_end(znode *result, znode *expr1, znode *expr2, znode *op_token CLS_DC);
+void do_boolean_or_begin(znode *expr1, znode *op_token CLS_DC);
+void do_boolean_or_end(znode *result, znode *expr1, znode *expr2, znode *op_token CLS_DC);
+void do_boolean_and_begin(znode *expr1, znode *op_token CLS_DC);               
+void do_boolean_and_end(znode *result, znode *expr1, znode *expr2, znode *op_token CLS_DC);
 
-void zend_do_brk_cont(int op, znode *expr CLS_DC);
+void do_brk_cont(int op, znode *expr CLS_DC);
 
-void zend_do_switch_cond(znode *cond CLS_DC);
-void zend_do_switch_end(znode *case_list CLS_DC);
-void zend_do_case_before_statement(znode *case_list, znode *case_token, znode *case_expr CLS_DC);
-void zend_do_case_after_statement(znode *result, znode *case_token CLS_DC);
-void zend_do_default_before_statement(znode *case_list, znode *default_token CLS_DC);
+void do_switch_cond(znode *cond CLS_DC);
+void do_switch_end(znode *case_list CLS_DC);
+void do_case_before_statement(znode *case_list, znode *case_token, znode *case_expr CLS_DC);
+void do_case_after_statement(znode *result, znode *case_token CLS_DC);
+void do_default_before_statement(znode *case_list, znode *default_token CLS_DC);
 
-void zend_do_begin_class_declaration(znode *class_name, znode *parent_class_name CLS_DC);
-void zend_do_end_class_declaration(CLS_D);
-void zend_do_declare_property(znode *var_name, znode *value CLS_DC);
+void do_begin_class_declaration(znode *class_name, znode *parent_class_name CLS_DC);
+void do_end_class_declaration(CLS_D);
+void do_declare_property(znode *var_name, znode *value CLS_DC);
 
-void zend_do_fetch_property(znode *result, znode *object, znode *property CLS_DC);
+void do_fetch_property(znode *result, znode *object, znode *property CLS_DC);
 
 
-void zend_do_push_object(znode *object CLS_DC);
-void zend_do_pop_object(znode *object CLS_DC);
+void do_push_object(znode *object CLS_DC);
+void do_pop_object(znode *object CLS_DC);
 
 
-void zend_do_begin_new_object(znode *new_token, znode *class_name CLS_DC);
-void zend_do_end_new_object(znode *result, znode *class_name, znode *new_token, znode *argument_list CLS_DC);
+void do_begin_new_object(znode *result, znode *variable, znode *new_token, znode *class_name CLS_DC);
+void do_end_new_object(znode *class_name, znode *new_token CLS_DC);
 
-void zend_do_fetch_constant(znode *result, znode *constant_name, int mode CLS_DC);
+void do_fetch_constant(znode *result, znode *constant_name, int mode CLS_DC);
 
-void zend_do_shell_exec(znode *result, znode *cmd CLS_DC);
+void do_shell_exec(znode *result, znode *cmd CLS_DC);
 
-void zend_do_init_array(znode *result, znode *expr, znode *offset, int is_ref CLS_DC);
-void zend_do_add_array_element(znode *result, znode *expr, znode *offset, int is_ref CLS_DC);
-void zend_do_add_static_array_element(znode *result, znode *offset, znode *expr);
-void zend_do_list_init(CLS_D);
-void zend_do_list_end(znode *result, znode *expr CLS_DC);
-void zend_do_add_list_element(znode *element CLS_DC);
-void zend_do_new_list_begin(CLS_D);
-void zend_do_new_list_end(CLS_D);
+void do_init_array(znode *result, znode *expr, znode *offset CLS_DC);
+void do_add_array_element(znode *result, znode *expr, znode *offset CLS_DC);
+void do_add_static_array_element(znode *result, znode *expr, znode *offset);
+void do_list_init();
+void do_list_end(znode *result, znode *expr CLS_DC);
+void do_add_list_element(znode *element CLS_DC);
+void do_new_list_begin(CLS_D);
+void do_new_list_end(CLS_D);
 
-void zend_do_cast(znode *result, znode *expr, int type CLS_DC);
-void zend_do_include_or_eval(int type, znode *result, znode *op1 CLS_DC);
+void do_cast(znode *result, znode *expr, int type CLS_DC);
+void do_include_or_eval(int type, znode *result, znode *op1 CLS_DC);
 
-void zend_do_unset(znode *variable CLS_DC);
-void zend_do_isset_or_isempty(int type, znode *result, znode *variable CLS_DC);
+void do_unset(znode *variable CLS_DC);
+void do_isset_or_isempty(int type, znode *result, znode *variable CLS_DC);
 
-void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable CLS_DC);
-void zend_do_foreach_cont(znode *value, znode *key, znode *as_token CLS_DC);
-void zend_do_foreach_end(znode *foreach_token, znode *open_brackets_token CLS_DC);
+void do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token CLS_DC);
+void do_foreach_cont(znode *value, znode *key, znode *as_token CLS_DC);
+void do_foreach_end(znode *foreach_token, znode *open_brackets_token CLS_DC);
 
-void zend_do_declare_begin(CLS_D);
-void zend_do_declare_stmt(znode *var, znode *val CLS_DC);
-void zend_do_declare_end(CLS_D);
+void do_end_heredoc(CLS_D);
 
-void zend_do_end_heredoc(CLS_D);
+void do_exit(znode *result, znode *message CLS_DC);
 
-void zend_do_exit(znode *result, znode *message CLS_DC);
+void do_begin_silence(znode *strudel_token CLS_DC);
+void do_end_silence(znode *strudel_token CLS_DC);
 
-void zend_do_begin_silence(znode *strudel_token CLS_DC);
-void zend_do_end_silence(znode *strudel_token CLS_DC);
+void do_begin_qm_op(znode *cond, znode *qm_token CLS_DC);
+void do_qm_true(znode *true_value, znode *qm_token, znode *colon_token CLS_DC);
+void do_qm_false(znode *result, znode *false_value, znode *qm_token, znode *colon_token CLS_DC);
 
-void zend_do_begin_qm_op(znode *cond, znode *qm_token CLS_DC);
-void zend_do_qm_true(znode *true_value, znode *qm_token, znode *colon_token CLS_DC);
-void zend_do_qm_false(znode *result, znode *false_value, znode *qm_token, znode *colon_token CLS_DC);
+void do_extended_info(CLS_D);
+void do_extended_fcall_begin(CLS_D);
+void do_extended_fcall_end(CLS_D);
 
-void zend_do_extended_info(CLS_D);
-void zend_do_extended_fcall_begin(CLS_D);
-void zend_do_extended_fcall_end(CLS_D);
 
-void zend_do_ticks(CLS_D);
-
-ZEND_API void function_add_ref(zend_function *function);
+/* helper functions in zend-scanner.l */
+ZEND_API int require_file(zend_file_handle *file_handle CLS_DC);	
+ZEND_API int require_filename(char *filename CLS_DC);				
+ZEND_API zend_op_array *compile_files(int mark_as_ref CLS_DC, int file_count, ...);
+ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);	
+ZEND_API zend_op_array *compile_filename(zval *filename CLS_DC);
+inline int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
 
 #define INITIAL_OP_ARRAY_SIZE 64
 
 
-/* helper functions in zend_language_scanner.l */
-ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type CLS_DC);
-ZEND_API zend_op_array *compile_string(zval *source_string, char *filename CLS_DC);	
-ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC);
-ZEND_API int zend_execute_scripts(int type CLS_DC ELS_DC, int file_count, ...);
-ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
-ZEND_API void init_op_array(zend_op_array *op_array, int type, int initial_ops_size CLS_DC);
+ZEND_API void init_op_array(zend_op_array *op_array, int initial_ops_size);
 ZEND_API void destroy_op_array(zend_op_array *op_array);
-ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle CLS_DC);
-ZEND_API void zend_file_handle_dtor(zend_file_handle *fh);
-
-ZEND_API void destroy_zend_function(zend_function *function);
-ZEND_API void destroy_zend_class(zend_class_entry *ce);
-void zend_class_add_ref(zend_class_entry *ce);
-
-#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
-#define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
 
+void destroy_zend_function(zend_function *function);
+void destroy_zend_class(zend_class_entry *ce);
 zend_op *get_next_op(zend_op_array *op_array CLS_DC);
-void init_op(zend_op *op CLS_DC);
 int get_next_op_number(zend_op_array *op_array);
 int print_class(zend_class_entry *class_entry);
 void print_op_array(zend_op_array *op_array, int optimizations);
 int pass_two(zend_op_array *op_array);
+void pass_include_eval(zend_op_array *op_array);
 zend_brk_cont_element *get_next_brk_cont_element(zend_op_array *op_array);
-ZEND_API zend_bool zend_is_compiling(void);
-ZEND_API char *zend_make_compiled_string_description(char *name);
+
 
 int zendlex(znode *zendlval CLS_DC);
 
+
 #define ZEND_NOP					0
 									
 #define ZEND_ADD					1
@@ -421,124 +354,111 @@ int zendlex(znode *zendlval CLS_DC);
 #define ZEND_BW_NOT					12
 #define ZEND_BOOL_NOT				13
 #define ZEND_BOOL_XOR				14
-#define ZEND_IS_IDENTICAL			15
-#define ZEND_IS_NOT_IDENTICAL       16
-#define ZEND_IS_EQUAL				17
-#define ZEND_IS_NOT_EQUAL			18
-#define ZEND_IS_SMALLER				19
-#define ZEND_IS_SMALLER_OR_EQUAL	20
-#define ZEND_CAST					21
-#define ZEND_QM_ASSIGN				22
+#define ZEND_IS_EQUAL				15
+#define ZEND_IS_NOT_EQUAL			16
+#define ZEND_IS_SMALLER				17
+#define ZEND_IS_SMALLER_OR_EQUAL	18
+#define ZEND_CAST					19
+#define ZEND_QM_ASSIGN				20
 
-#define ZEND_ASSIGN_ADD				23
-#define ZEND_ASSIGN_SUB				24
-#define ZEND_ASSIGN_MUL				25
-#define ZEND_ASSIGN_DIV				26
-#define ZEND_ASSIGN_MOD				27
-#define ZEND_ASSIGN_SL				28
-#define ZEND_ASSIGN_SR				29
-#define ZEND_ASSIGN_CONCAT			30
-#define ZEND_ASSIGN_BW_OR			31
-#define ZEND_ASSIGN_BW_AND			32
-#define ZEND_ASSIGN_BW_XOR			33
+#define ZEND_ASSIGN_ADD				21
+#define ZEND_ASSIGN_SUB				22
+#define ZEND_ASSIGN_MUL				23
+#define ZEND_ASSIGN_DIV				24
+#define ZEND_ASSIGN_MOD				25
+#define ZEND_ASSIGN_SL				26
+#define ZEND_ASSIGN_SR				27
+#define ZEND_ASSIGN_CONCAT			28
+#define ZEND_ASSIGN_BW_OR			29
+#define ZEND_ASSIGN_BW_AND			30
+#define ZEND_ASSIGN_BW_XOR			31
 									
-#define ZEND_PRE_INC				34
-#define ZEND_PRE_DEC				35
-#define ZEND_POST_INC				36
-#define ZEND_POST_DEC				37
-								 	
-#define ZEND_ASSIGN					38
-#define ZEND_ASSIGN_REF				39
-
-#define ZEND_ECHO					40
-#define ZEND_PRINT					41
-
-#define ZEND_JMP					42
-#define ZEND_JMPZ					43
-#define ZEND_JMPNZ					44
-#define ZEND_JMPZNZ					45
-#define ZEND_JMPZ_EX				46
-#define ZEND_JMPNZ_EX				47
-#define ZEND_CASE					48
-#define ZEND_SWITCH_FREE			49
-#define ZEND_BRK					50
-#define ZEND_CONT					51
-#define ZEND_BOOL					52
-
-#define ZEND_INIT_STRING			53
-#define ZEND_ADD_CHAR				54
-#define ZEND_ADD_STRING				55
-#define ZEND_ADD_VAR				56
-
-#define ZEND_BEGIN_SILENCE			57
-#define ZEND_END_SILENCE			58
-
-#define ZEND_INIT_FCALL_BY_NAME		59
-#define ZEND_DO_FCALL				60
-#define ZEND_DO_FCALL_BY_NAME		61
-#define ZEND_RETURN					62
-
-#define ZEND_RECV					63
-#define ZEND_RECV_INIT				64
+#define ZEND_PRE_INC				32
+#define ZEND_PRE_DEC				33
+#define ZEND_POST_INC				34
+#define ZEND_POST_DEC				35
 									
-#define ZEND_SEND_VAL				65
-#define ZEND_SEND_VAR				66
-#define ZEND_SEND_REF				67
+#define ZEND_ASSIGN					36
+#define ZEND_ASSIGN_REF				37
 
-#define ZEND_NEW 					68
-#define ZEND_JMP_NO_CTOR			69
-#define ZEND_FREE					70
+#define ZEND_ECHO_OP				38
+#define ZEND_PRINT_OP				39
+
+#define ZEND_JMP					40
+#define ZEND_JMPZ					41
+#define ZEND_JMPNZ					42
+#define ZEND_JMPZNZ					43
+#define ZEND_JMPZ_EX				44
+#define ZEND_JMPNZ_EX				45
+#define ZEND_CASE					46
+#define ZEND_BRK					47
+#define ZEND_CONT					48
+#define ZEND_BOOL					49
+
+#define ZEND_INIT_STRING			50
+#define ZEND_ADD_CHAR				51
+#define ZEND_ADD_STRING				52
+#define ZEND_ADD_VAR				53
+
+#define ZEND_BEGIN_SILENCE			54
+#define ZEND_END_SILENCE			55
+
+#define ZEND_INIT_FCALL				56
+#define ZEND_INIT_FCALL_BY_NAME		57
+#define ZEND_DO_FCALL				58
+#define ZEND_RETURN					59
+
+#define ZEND_RECV					60
+#define ZEND_RECV_INIT				61
 									
-#define ZEND_INIT_ARRAY				71
-#define ZEND_ADD_ARRAY_ELEMENT		72
+#define ZEND_SEND_VAL				62
+#define ZEND_SEND_VAR				63
+#define ZEND_SEND_REF				64
+
+#define ZEND_NEW 					65
+#define ZEND_JMP_NO_CTOR			66
+#define ZEND_FREE					67
 									
-#define ZEND_INCLUDE_OR_EVAL		73
+#define ZEND_INIT_ARRAY				68
+#define ZEND_ADD_ARRAY_ELEMENT		69
 									
-#define ZEND_UNSET_VAR				74
-#define ZEND_UNSET_DIM_OBJ			75
-#define ZEND_ISSET_ISEMPTY			76
+#define ZEND_INCLUDE_OR_EVAL		70
 									
-#define ZEND_FE_RESET				77
-#define ZEND_FE_FETCH				78
+#define ZEND_UNSET_VAR				71
+#define ZEND_UNSET_DIM_OBJ			72
+#define ZEND_ISSET_ISEMPTY			73
 									
-#define ZEND_EXIT					79
+#define ZEND_FE_RESET				74
+#define ZEND_FE_FETCH				75
+									
+#define ZEND_EXIT					76
 
 
-/* the following 18 opcodes are 6 groups of 3 opcodes each, and must
+/* the following 12 opcodes are 4 groups of 3 opcodes each, and must
  * remain in that order!
  */
-#define ZEND_FETCH_R				80
-#define ZEND_FETCH_DIM_R			81
-#define ZEND_FETCH_OBJ_R			82
-#define ZEND_FETCH_W				83
-#define ZEND_FETCH_DIM_W			84
-#define ZEND_FETCH_OBJ_W			85
-#define ZEND_FETCH_RW				86
-#define ZEND_FETCH_DIM_RW			87
-#define ZEND_FETCH_OBJ_RW			88
-#define ZEND_FETCH_IS				89
-#define ZEND_FETCH_DIM_IS			90
-#define ZEND_FETCH_OBJ_IS			91
-#define ZEND_FETCH_FUNC_ARG			92
-#define ZEND_FETCH_DIM_FUNC_ARG		93
-#define ZEND_FETCH_OBJ_FUNC_ARG		94
-#define ZEND_FETCH_UNSET			95
-#define ZEND_FETCH_DIM_UNSET		96
-#define ZEND_FETCH_OBJ_UNSET		97
+#define ZEND_FETCH_R				77
+#define ZEND_FETCH_DIM_R			78
+#define ZEND_FETCH_OBJ_R			79
+#define ZEND_FETCH_W				80
+#define ZEND_FETCH_DIM_W			81
+#define ZEND_FETCH_OBJ_W			82
+#define ZEND_FETCH_RW				83
+#define ZEND_FETCH_DIM_RW			84
+#define ZEND_FETCH_OBJ_RW			85
+#define ZEND_FETCH_IS				86
+#define ZEND_FETCH_DIM_IS			87
+#define ZEND_FETCH_OBJ_IS			88
 
-#define ZEND_FETCH_DIM_TMP_VAR		98
-#define ZEND_FETCH_CONSTANT			99
+#define ZEND_FETCH_DIM_TMP_VAR		89
+#define ZEND_FETCH_CONSTANT			90
 
-#define ZEND_DECLARE_FUNCTION_OR_CLASS	100
+#define ZEND_INIT_GLOBALS			91
 
-#define ZEND_EXT_STMT				101
-#define ZEND_EXT_FCALL_BEGIN		102
-#define ZEND_EXT_FCALL_END			103
-#define ZEND_EXT_NOP				104
-
-#define ZEND_TICKS					105
-
-#define ZEND_SEND_VAR_NO_REF		106
+#define ZEND_EXT_STMT				92
+#define ZEND_EXT_FCALL_BEGIN		93
+#define ZEND_EXT_FCALL_END			94
+#define ZEND_EXT_NOP				95
 
 /* end of block */
 
@@ -551,28 +471,22 @@ int zendlex(znode *zendlval CLS_DC);
 #define ZEND_FETCH_STATIC	2
 
 /* var status for backpatching */
-#define BP_VAR_R			0
-#define BP_VAR_W			1
-#define BP_VAR_RW			2
-#define BP_VAR_IS			3
-#define BP_VAR_NA			4	/* if not applicable */
-#define BP_VAR_FUNC_ARG		5
-#define BP_VAR_UNSET		6
+#define BP_VAR_R	0
+#define BP_VAR_W	1
+#define BP_VAR_RW	2
+#define BP_VAR_IS	3
+#define BP_VAR_NA	4	/* if not applicable */
 
 
 #define ZEND_INTERNAL_FUNCTION		1
 #define ZEND_USER_FUNCTION			2
 #define ZEND_OVERLOADED_FUNCTION	3
-#define	ZEND_EVAL_CODE				4
 
 #define ZEND_INTERNAL_CLASS		1
 #define ZEND_USER_CLASS			2
 
 #define ZEND_EVAL				(1<<0)
 #define ZEND_INCLUDE			(1<<1)
-#define ZEND_INCLUDE_ONCE		(1<<2)
-#define ZEND_REQUIRE			(1<<3)
-#define ZEND_REQUIRE_ONCE		(1<<4)
 
 #define ZEND_ISSET				(1<<0)
 #define ZEND_ISEMPTY			(1<<1)
@@ -581,54 +495,9 @@ int zendlex(znode *zendlval CLS_DC);
 #define ZEND_RT (1<<1)
 
 
-#define ZEND_HANDLE_FILENAME		0
-#define ZEND_HANDLE_FD				1
-#define ZEND_HANDLE_FP				2
-#define ZEND_HANDLE_STDIOSTREAM		3
-#define ZEND_HANDLE_FSTREAM			4
+#define ZEND_HANDLE_FILENAME	0
+#define ZEND_HANDLE_FD			1
+#define ZEND_HANDLE_FP			2
+#define ZEND_HANDLE_ISTREAM		3
 
-#define ZEND_DECLARE_CLASS				1
-#define ZEND_DECLARE_FUNCTION			2
-#define ZEND_DECLARE_INHERITED_CLASS	3
-
-#define ZEND_FETCH_STANDARD		0
-#define ZEND_FETCH_ADD_LOCK		1
-
-#define ZEND_MEMBER_FUNC_CALL	1<<0
-#define ZEND_CTOR_CALL			1<<1
-
-#define ZEND_ARG_SEND_BY_REF (1<<0)
-#define ZEND_ARG_COMPILE_TIME_BOUND (1<<1)
-
-#define AI_USE_PTR(ai) \
-	if ((ai).ptr_ptr) { \
-		(ai).ptr = *((ai).ptr_ptr); \
-		(ai).ptr_ptr = &((ai).ptr); \
-	} else { \
-		(ai).ptr = NULL; \
-	}
-
-/* Lost In Stupid Parentheses */
-#define ARG_SHOULD_BE_SENT_BY_REF(offset, conduct_check, arg_types)	\
-	(																\
-		conduct_check												\
-		&& arg_types												\
-		&&															\
-		(															\
-			(														\
-				offset<=arg_types[0]								\
-				&& arg_types[offset]==BYREF_FORCE					\
-			)														\
-		||	(														\
-				offset>=arg_types[0]								\
-				&& arg_types[arg_types[0]]==BYREF_FORCE_REST		\
-			)														\
-		)															\
-	)
-
-#define ZEND_RETURN_VAL 0
-#define ZEND_RETURN_REF 1
-
-END_EXTERN_C()
-
-#endif /* ZEND_COMPILE_H */
+#endif /* _COMPILE_H */

Zend/zend_config.w32.h

@@ -1,86 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_CONFIG_W32_H
-#define ZEND_CONFIG_W32_H
-
-
-#include <string.h>
-#include <windows.h>
-#include <float.h>
-
-typedef unsigned long ulong;
-typedef unsigned int uint;
-
-#define HAVE_ALLOCA 1
-#define HAVE_LIMITS_H 1
-#include <malloc.h>
-
-#undef HAVE_KILL
-#define HAVE_GETPID 1
-/* #define HAVE_ALLOCA_H 1 */
-#define HAVE_MEMCPY 1
-#define HAVE_STRDUP 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIOSTR_H 1
-#define HAVE_CLASS_ISTDIOSTREAM
-#define istdiostream stdiostream
-#define HAVE_STDARG_H	1
-#define HAVE_SNPRINTF	1
-#define HAVE_VSNPRINTF	1
-
-#define vsnprintf _vsnprintf
-#define zend_isinf(a)	0
-
-#define zend_sprintf sprintf
-
-/* This will cause the compilation process to be MUCH longer, but will generate
- * a much quicker PHP binary
- */
-#undef inline
-#ifdef ZEND_WIN32_FORCE_INLINE
-# define inline __forceinline
-#else
-# define inline
-#endif
-
-#define zend_finite(A) _finite(A)
-#define zend_isnan(A) _isnan(A)
-
-#ifdef LIBZEND_EXPORTS
-#	define ZEND_API __declspec(dllexport)
-#else
-#	define ZEND_API __declspec(dllimport)
-#endif
-
-#define ZEND_DLEXPORT		__declspec(dllexport)
-
-/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under Windows NT 
- * (and requires _WIN32_WINNT to be defined, which prevents the resulting executable
- * from running under Windows 9x
- * Windows 9x should silently ignore it, so it's being used here directly
- */
-#ifndef MB_SERVICE_NOTIFICATION
-#define	MB_SERVICE_NOTIFICATION		0x00200000L
-#endif
-
-#define ZEND_SERVICE_MB_STYLE		(MB_TOPMOST|MB_SERVICE_NOTIFICATION)
-
-#endif /* ZEND_CONFIG_W32_H */

Zend/zend_constants.c

@@ -2,15 +2,12 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
@@ -34,23 +31,6 @@ void free_zend_constant(zend_constant *c)
 }
 
 
-void copy_zend_constant(zend_constant *c)
-{
-	c->name = zend_strndup(c->name, c->name_len);
-	if (!(c->flags & CONST_PERSISTENT)) {
-		zval_copy_ctor(&c->value);
-	}
-}
-
-
-void zend_copy_constants(HashTable *target, HashTable *source)
-{
-	zend_constant tmp_constant;
-
-	zend_hash_copy(target, source, (copy_ctor_func_t) copy_zend_constant, &tmp_constant, sizeof(zend_constant));
-}
-
-
 static int clean_non_persistent_constant(zend_constant *c)
 {
 	if (c->flags & CONST_PERSISTENT) {
@@ -73,45 +53,50 @@ static int clean_module_constant(zend_constant *c, int *module_number)
 
 void clean_module_constants(int module_number)
 {
-	ELS_FETCH();
-
 	zend_hash_apply_with_argument(EG(zend_constants), (int (*)(void *,void *)) clean_module_constant, (void *) &module_number);
 }
 
 
-int zend_startup_constants(ELS_D)
+int zend_startup_constants(void)
 {
-#ifdef ZEND_WIN32
+#if WIN32|WINNT
 	DWORD dwBuild=0;
 	DWORD dwVersion = GetVersion();
 	DWORD dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
 	DWORD dwWindowsMinorVersion =  (DWORD)(HIBYTE(LOWORD(dwVersion)));
 #endif
 
+
+/* ZEND_FIX:  Move to PHP */
+#if 0
+#if WIN32|WINNT
+	// Get build numbers for Windows NT or Win95
+	if (dwVersion < 0x80000000){
+		php3_os="WINNT";
+	} else {
+		php3_os="WIN32";
+	}
+#else
+	php3_os=PHP_OS;
+#endif
+#endif
+
+
 	EG(zend_constants) = (HashTable *) malloc(sizeof(HashTable));
 
-	if (zend_hash_init(EG(zend_constants), 20, NULL, ZEND_CONSTANT_DTOR, 1)==FAILURE) {
+	if (zend_hash_init(EG(zend_constants), 20, NULL, (void(*)(void *)) free_zend_constant, 1)==FAILURE) {
 		return FAILURE;
 	}
-	return SUCCESS;
-}
 
-
-
-void zend_register_standard_constants(ELS_D)
-{
+#if 0
+	/* This should go back to PHP */
+	REGISTER_MAIN_STRINGL_CONSTANT("PHP_VERSION", PHP_VERSION, sizeof(PHP_VERSION)-1, CONST_PERSISTENT | CONST_CS);
+	REGISTER_MAIN_STRINGL_CONSTANT("PHP_OS", php3_os, strlen(php3_os), CONST_PERSISTENT | CONST_CS);
+#endif
 	REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_USER_ERROR", E_USER_ERROR, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_USER_WARNING", E_USER_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
-
+	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
 
 	/* true/false constants */
@@ -122,33 +107,24 @@ void zend_register_standard_constants(ELS_D)
 		c.flags = CONST_PERSISTENT;
 		c.module_number = 0;
 
-		c.name = zend_strndup(ZEND_STRL("TRUE"));
-		c.name_len = sizeof("TRUE");
+		c.name = zend_strndup("TRUE",4);
+		c.name_len = 5;
 		c.value.value.lval = 1;
 		c.value.type = IS_BOOL;
-		zend_register_constant(&c ELS_CC);
+		zend_register_constant(&c);
 		
-		c.name = zend_strndup(ZEND_STRL("FALSE"));
-		c.name_len = sizeof("FALSE");
+		c.name = zend_strndup("FALSE",5);
+		c.name_len = 6;
 		c.value.value.lval = 0;
 		c.value.type = IS_BOOL;
-		zend_register_constant(&c ELS_CC);
-
-		c.name = zend_strndup(ZEND_STRL("ZEND_THREAD_SAFE"));
-		c.name_len = sizeof("ZEND_THREAD_SAFE");
-		c.value.value.lval = ZTS_V;
-		c.value.type = IS_BOOL;
-		zend_register_constant(&c ELS_CC);
-
-		c.name = zend_strndup(ZEND_STRL("NULL"));
-		c.name_len = sizeof("NULL");
-		c.value.type = IS_NULL;
-		zend_register_constant(&c ELS_CC);
+		zend_register_constant(&c);
 	}
+
+	return SUCCESS;
 }
 
 
-int zend_shutdown_constants(ELS_D)
+int zend_shutdown_constants(void)
 {
 	zend_hash_destroy(EG(zend_constants));
 	free(EG(zend_constants));
@@ -158,13 +134,11 @@ int zend_shutdown_constants(ELS_D)
 
 void clean_non_persistent_constants(void)
 {
-	ELS_FETCH();
-
 	zend_hash_apply(EG(zend_constants), (int (*)(void *)) clean_non_persistent_constant);
 }
 
 
-ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number ELS_DC)
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number)
 {
 	zend_constant c;
 	
@@ -174,11 +148,11 @@ ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval,
 	c.name = zend_strndup(name,name_len);
 	c.name_len = name_len;
 	c.module_number = module_number;
-	zend_register_constant(&c ELS_CC);
+	zend_register_constant(&c);
 }
 
 
-ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number ELS_DC)
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number)
 {
 	zend_constant c;
 	
@@ -188,11 +162,11 @@ ZEND_API void zend_register_double_constant(char *name, uint name_len, double dv
 	c.name = zend_strndup(name,name_len);
 	c.name_len = name_len;
 	c.module_number = module_number;
-	zend_register_constant(&c ELS_CC);
+	zend_register_constant(&c);
 }
 
 
-ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number ELS_DC)
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number)
 {
 	zend_constant c;
 	
@@ -203,13 +177,13 @@ ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *st
 	c.name = zend_strndup(name,name_len);
 	c.name_len = name_len;
 	c.module_number = module_number;
-	zend_register_constant(&c ELS_CC);
+	zend_register_constant(&c);
 }
 
 
-ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number ELS_DC)
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number)
 {
-	zend_register_stringl_constant(name, name_len, strval, strlen(strval), flags, module_number ELS_CC);
+	zend_register_stringl_constant(name, name_len, strval, strlen(strval), flags, module_number);
 }
 
 
@@ -218,7 +192,6 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result)
 	zend_constant *c;
 	char *lookup_name = estrndup(name,name_len);
 	int retval;
-	ELS_FETCH();
 
 	zend_str_tolower(lookup_name, name_len);
 
@@ -239,10 +212,9 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result)
 }
 
 
-ZEND_API int zend_register_constant(zend_constant *c ELS_DC)
+ZEND_API void zend_register_constant(zend_constant *c)
 {
 	char *lowercase_name = zend_strndup(c->name, c->name_len);
-	int ret = SUCCESS;
 
 #if 0
 	printf("Registering constant for module %d\n",c->module_number);
@@ -251,11 +223,8 @@ ZEND_API int zend_register_constant(zend_constant *c ELS_DC)
 	zend_str_tolower(lowercase_name, c->name_len);
 	if (zend_hash_add(EG(zend_constants), lowercase_name, c->name_len, (void *) c, sizeof(zend_constant), NULL)==FAILURE) {
 		zval_dtor(&c->value);
-		zend_error(E_NOTICE,"Constant %s already defined",lowercase_name);
-		ret = FAILURE;
 	}
 	free(lowercase_name);
-	return ret;
 }
 
 

Zend/zend_constants.h

@@ -2,31 +2,25 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_CONSTANTS_H
-#define ZEND_CONSTANTS_H
-
-#include "zend_globals.h"
+#ifndef _CONSTANTS_H
+#define _CONSTANTS_H
 
 #define CONST_CS 0x1				/* Case Sensitive */
 #define CONST_PERSISTENT 0x2
 
-typedef struct _zend_constant {
+typedef struct {
 	zval value;
 	int flags;
 	char *name;
@@ -34,31 +28,26 @@ typedef struct _zend_constant {
 	int module_number;
 } zend_constant;
 
-#define REGISTER_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),module_number ELS_CC)
-#define REGISTER_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),module_number ELS_CC)
-#define REGISTER_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),module_number ELS_CC)
-#define REGISTER_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),module_number ELS_CC)
+#define REGISTER_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),module_number)
+#define REGISTER_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),module_number)
+#define REGISTER_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),module_number)
+#define REGISTER_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),module_number)
 
-#define REGISTER_MAIN_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),0 ELS_CC)
-#define REGISTER_MAIN_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),0 ELS_CC)
-#define REGISTER_MAIN_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),0 ELS_CC)
-#define REGISTER_MAIN_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),0 ELS_CC)
+#define REGISTER_MAIN_LONG_CONSTANT(name,lval,flags)  zend_register_long_constant((name),sizeof(name),(lval),(flags),0)
+#define REGISTER_MAIN_DOUBLE_CONSTANT(name,dval,flags)  zend_register_double_constant((name),sizeof(name),(dval),(flags),0)
+#define REGISTER_MAIN_STRING_CONSTANT(name,str,flags)  zend_register_string_constant((name),sizeof(name),(str),(flags),0)
+#define REGISTER_MAIN_STRINGL_CONSTANT(name,str,len,flags)  zend_register_stringl_constant((name),sizeof(name),(str),(len),(flags),0)
 
 void clean_module_constants(int module_number);
 void free_zend_constant(zend_constant *c);
-int zend_startup_constants(ELS_D);
-int zend_shutdown_constants(ELS_D);
-void zend_register_standard_constants(ELS_D);
+int zend_startup_constants(void);
+int zend_shutdown_constants(void);
 void clean_non_persistent_constants(void);
 ZEND_API int zend_get_constant(char *name, uint name_len, zval *result);
-ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number ELS_DC);
-ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number ELS_DC);
-ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number ELS_DC);
-ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number ELS_DC);
-ZEND_API int zend_register_constant(zend_constant *c ELS_DC);
-void zend_copy_constants(HashTable *target, HashTable *sourc);
-void copy_zend_constant(zend_constant *c);
-
-#define ZEND_CONSTANT_DTOR (void (*)(void *)) free_zend_constant
+ZEND_API void zend_register_long_constant(char *name, uint name_len, long lval, int flags, int module_number);
+ZEND_API void zend_register_double_constant(char *name, uint name_len, double dval, int flags, int module_number);
+ZEND_API void zend_register_string_constant(char *name, uint name_len, char *strval, int flags, int module_number);
+ZEND_API void zend_register_stringl_constant(char *name, uint name_len, char *strval, uint strlen, int flags, int module_number);
+ZEND_API void zend_register_constant(zend_constant *c);
 
 #endif

Zend/zend_dynamic_array.c

@@ -1,62 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-#include "zend.h"
-
-typedef struct _dynamic_array {
-        char *array;
-        unsigned int element_size;
-        unsigned int current;
-        unsigned int allocated;
-} dynamic_array;
-
-ZEND_API int zend_dynamic_array_init(dynamic_array *da, unsigned int element_size, unsigned int size)
-{
-	da->element_size = element_size;
-	da->allocated = size;
-	da->current = 0;
-	da->array = (char *) emalloc(size*element_size);
-	if (da->array == NULL) {
-		return 1;
-	}
-	return 0;
-}
-
-ZEND_API void *zend_dynamic_array_push(dynamic_array *da)
-{
-	if (da->current == da->allocated) {
-		da->allocated *= 2;
-		da->array = (char *) erealloc(da->array, da->allocated*da->element_size);
-	}
-	return (void *)(da->array+(da->current++)*da->element_size);
-}
-
-ZEND_API void *zend_dynamic_array_pop(dynamic_array *da)
-{
-	return (void *)(da->array+(--(da->current))*da->element_size);
-
-}
-
-ZEND_API void *zend_dynamic_array_get_element(dynamic_array *da, unsigned int index)
-{
-	if (index >= da->current) {
-		return NULL;
-	}
-	return (void *)(da->array+index*da->element_size);
-}

Zend/zend_dynamic_array.h

@@ -1,38 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_DYNAMIC_ARRAY_H
-#define ZEND_DYNAMIC_ARRAY_H
-
-typedef struct _dynamic_array {
-	char *array;
-	unsigned int element_size;
-	unsigned int last_used;
-	unsigned int allocated;
-} dynamic_array;
-
-BEGIN_EXTERN_C()
-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);
-END_EXTERN_C()
-
-#endif /* ZEND_DYNAMIC_ARRAY_H */

Zend/zend_errors.h

@@ -2,39 +2,32 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
+#ifndef _ZEND_ERRORS_H
+#define _ZEND_ERRORS_H
 
-#ifndef ZEND_ERRORS_H
-#define ZEND_ERRORS_H
+#define E_CORE_ERROR 	(1<<0L)
+#define E_CORE_WARNING	(1<<1L)
+#define E_COMPILE_ERROR	(1<<2L)
+#define E_COMPILE_WARNING	(1<<3L)
+#define E_PARSE			(1<<4L)
+#define E_ERROR			(1<<5L)
+#define E_WARNING		(1<<6L)
+#define E_NOTICE		(1<<7L)
 
-#define E_ERROR				(1<<0L)
-#define E_WARNING			(1<<1L)
-#define E_PARSE				(1<<2L)
-#define E_NOTICE			(1<<3L)
-#define E_CORE_ERROR		(1<<4L)
-#define E_CORE_WARNING		(1<<5L)
-#define E_COMPILE_ERROR		(1<<6L)
-#define E_COMPILE_WARNING	(1<<7L)
-#define E_USER_ERROR		(1<<8L)
-#define E_USER_WARNING		(1<<9L)
-#define E_USER_NOTICE		(1<<10L)
-
-#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE)
+#define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING)
 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
 
-#endif /* ZEND_ERRORS_H */
 
+#endif /* _ZEND_ERRORS_H */

Zend/zend_execute.h

@@ -2,47 +2,32 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_EXECUTE_H
-#define ZEND_EXECUTE_H
+#ifndef _EXECUTE_H
+#define _EXECUTE_H
 
 #include "zend_compile.h"
 #include "zend_hash.h"
-#include "zend_variables.h"
-#include "zend_execute_locks.h"
 
-typedef union _temp_variable {
+typedef union {
 	zval tmp_var;
+	zval **var;
 	struct {
-		zval **ptr_ptr;
-		zval *ptr;
-	} var;
-	struct {
-		zval tmp_var; /* a dummy */
+		zval **var_dummy; /* a dummy */
 
-		union {
-			struct {
-				zval *str;
-				int offset;
-			} str_offset;
-			zend_property_reference overloaded_element;
-		} data;
-			
+		zval *str;
+		int offset;
 		unsigned char type;
 	} EA;
 } temp_variable;
@@ -54,79 +39,11 @@ void init_executor(CLS_D ELS_DC);
 void shutdown_executor(ELS_D);
 void execute(zend_op_array *op_array ELS_DC);
 ZEND_API int zend_is_true(zval *op);
-static inline void safe_free_zval_ptr(zval *p)
-{
-	ELS_FETCH();
-
-	if (p!=EG(uninitialized_zval_ptr)) {
-		FREE_ZVAL(p);
-	}
-}
-
-ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name CLS_DC ELS_DC);
-static inline int i_zend_is_true(zval *op)
-{
-	int result;
-
-	switch (op->type) {
-		case IS_NULL:
-			result = 0;
-			break;
-		case IS_LONG:
-		case IS_BOOL:
-		case IS_RESOURCE:
-			result = (op->value.lval?1:0);
-			break;
-		case IS_DOUBLE:
-			result = (op->value.dval ? 1 : 0);
-			break;
-		case IS_STRING:
-			if (op->value.str.len == 0
-				|| (op->value.str.len==1 && op->value.str.val[0]=='0')) {
-				result = 0;
-			} else {
-				result = 1;
-			}
-			break;
-		case IS_ARRAY:
-			result = (zend_hash_num_elements(op->value.ht)?1:0);
-			break;
-		case IS_OBJECT:
-			result = (zend_hash_num_elements(op->value.obj.properties)?1:0);
-			break;
-		default:
-			result = 0;
-			break;
-	}
-	return result;
-}
-
-ZEND_API int zval_update_constant(zval **pp, void *arg);
-
-/* dedicated Zend executor functions - do not use! */
-static inline void zend_ptr_stack_clear_multiple(ELS_D)
-{
-	void **p = EG(argument_stack).top_element-2;
-	int delete_count = (ulong) *p;
-
-	EG(argument_stack).top -= (delete_count+2);
-	while (--delete_count>=0) {
-		zval_ptr_dtor((zval **) --p);
-	}
-	EG(argument_stack).top_element = p;
-}
-
-static inline int zend_ptr_stack_get_arg(int requested_arg, void **data ELS_DC)
-{
-	void **p = EG(argument_stack).top_element-2;
-	int arg_count = (ulong) *p;
-
-	if (requested_arg>arg_count) {
-		return FAILURE;
-	}
-	*data = (p-arg_count+requested_arg-1);
-	return SUCCESS;
-}
+ZEND_API inline void safe_free_zval_ptr(zval *p);
+ZEND_API void zend_eval_string(char *str, zval *retval CLS_DC ELS_DC);
+ZEND_API inline int i_zend_is_true(zval *op);
+ZEND_API void zval_update_constant(zval *p);
+ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC);
 
 #if SUPPORT_INTERACTIVE
 void execute_new_code(CLS_D);
@@ -134,80 +51,17 @@ void execute_new_code(CLS_D);
 
 
 /* services */
-ZEND_API char *get_active_function_name(void);
+ZEND_API char *get_active_function_name();
 ZEND_API char *zend_get_executed_filename(ELS_D);
 ZEND_API uint zend_get_executed_lineno(ELS_D);
-ZEND_API zend_bool zend_is_executing(void);
-
-ZEND_API void zend_set_timeout(long seconds);
-ZEND_API void zend_unset_timeout(void);
-ZEND_API void zend_timeout(int dummy);
-
-#ifdef ZEND_WIN32
-void zend_init_timeout_thread();
-void zend_shutdown_timeout_thread();
-#define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
-#define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
-#endif
 
 #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 #define zendi_zval_dtor(p) zval_dtor(&(p))
 
 #define active_opline (*EG(opline_ptr))
 
-static inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC)
-{
-	zval *variable_ptr;
-	zval *value_ptr;
-
-	if (!value_ptr_ptr || !variable_ptr_ptr) {
-		zend_error(E_ERROR, "Cannot create references to/from string offsets nor overloaded objects");
-		return;
-	}
-
-	variable_ptr = *variable_ptr_ptr;
-	value_ptr = *value_ptr_ptr;
-
-	if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) {
-		variable_ptr_ptr = &EG(uninitialized_zval_ptr);
-/*	} else if (variable_ptr==&EG(uninitialized_zval) || variable_ptr!=value_ptr) { */
-	} else if (variable_ptr_ptr != value_ptr_ptr) {
-		variable_ptr->refcount--;
-		if (variable_ptr->refcount==0) {
-			zendi_zval_dtor(*variable_ptr);
-			FREE_ZVAL(variable_ptr);
-		}
-
-		if (!PZVAL_IS_REF(value_ptr)) {
-			/* break it away */
-			value_ptr->refcount--;
-			if (value_ptr->refcount>0) {
-				ALLOC_ZVAL(*value_ptr_ptr);
-				**value_ptr_ptr = *value_ptr;
-				value_ptr = *value_ptr_ptr;
-				zendi_zval_copy_ctor(*value_ptr);
-			}
-			value_ptr->refcount = 1;
-			value_ptr->is_ref = 1;
-		}
-
-		*variable_ptr_ptr = value_ptr;
-		value_ptr->refcount++;
-	} else {
-		if (variable_ptr->refcount>1) { /* we need to break away */
-			SEPARATE_ZVAL(variable_ptr_ptr);
-		}
-		(*variable_ptr_ptr)->is_ref = 1;
-	}
-
-	if (result && !(result->u.EA.type & EXT_TYPE_UNUSED)) {
-		Ts[result->u.var].var.ptr_ptr = variable_ptr_ptr;
-		SELECTIVE_PZVAL_LOCK(*variable_ptr_ptr, result);
-		AI_USE_PTR(Ts[result->u.var].var);
-	}
-}
 
 #define IS_OVERLOADED_OBJECT 1
 #define IS_STRING_OFFSET 2
 
-#endif /* ZEND_EXECUTE_H */
+#endif /* _EXECUTE_H */

Zend/zend_execute_API.c

@@ -2,22 +2,18 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
 #include <stdio.h>
 #include <signal.h>
 
@@ -26,53 +22,30 @@
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "zend_ptr_stack.h"
+#include "zend_variables.h"
+#include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
-#include "zend_execute_locks.h"
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 
 ZEND_API void (*zend_execute)(zend_op_array *op_array ELS_DC);
 
-#ifdef ZEND_WIN32
-#include <process.h>
-/* true global */
-static WNDCLASS wc;
-static HWND timeout_window;
-static HANDLE timeout_thread_event;
-static DWORD timeout_thread_id;
-static int timeout_thread_initialized=0;
-#endif
 
-
-#if ZEND_DEBUG
 static void (*original_sigsegv_handler)(int);
 static void zend_handle_sigsegv(int dummy)
 {
 	fflush(stdout);
-	fflush(stderr);
-	if (original_sigsegv_handler==zend_handle_sigsegv) {
-		signal(SIGSEGV, original_sigsegv_handler);
-	} else {
-		signal(SIGSEGV, SIG_DFL);
-	}
-	{
-		ELS_FETCH();
-
-		fprintf(stderr, "SIGSEGV caught on opcode %d on opline %d of %s() at %s:%d\n\n",
-				active_opline->opcode,
-				active_opline-EG(active_op_array)->opcodes,
-				get_active_function_name(),
-				zend_get_executed_filename(ELS_C),
-				zend_get_executed_lineno(ELS_C));
-	}
-	if (original_sigsegv_handler!=zend_handle_sigsegv) {
-		original_sigsegv_handler(dummy);
-	}
+	signal(SIGSEGV, original_sigsegv_handler);
+/*
+	printf("SIGSEGV caught on opcode %d on opline %d of %s() at %s:%d\n\n",
+			active_opline->opcode,
+			active_opline-EG(active_op_array)->opcodes,
+			get_active_function_name(),
+			zend_get_executed_filename(),
+			zend_get_executed_lineno());
+	original_sigsegv_handler(dummy);
+*/
 }
-#endif
 
 
 static void zend_extension_activator(zend_extension *extension)
@@ -91,32 +64,21 @@ static void zend_extension_deactivator(zend_extension *extension)
 }
 
 
-static int is_not_internal_function(zend_function *function)
-{
-	return(function->type != ZEND_INTERNAL_FUNCTION);
-}
-
-
-static int is_not_internal_class(zend_class_entry *ce)
-{
-	return(ce->type != ZEND_INTERNAL_CLASS);
-}
-
-
 void init_executor(CLS_D ELS_DC)
 {
-	INIT_ZVAL(EG(uninitialized_zval));
-	INIT_ZVAL(EG(error_zval));
+	var_uninit(&EG(uninitialized_zval));
+	var_uninit(&EG(error_zval));
+	EG(uninitialized_zval).refcount = 1;
+	EG(uninitialized_zval).is_ref=0;
 	EG(uninitialized_zval_ptr)=&EG(uninitialized_zval);
+	EG(error_zval).refcount = 1;
+	EG(error_zval).is_ref=0;
 	EG(error_zval_ptr)=&EG(error_zval);
+	zend_ptr_stack_init(&EG(function_symbol_table_stack));
 	zend_ptr_stack_init(&EG(arg_types_stack));
-/* destroys stack frame, therefore makes core dumps worthless */
-#if 0&&ZEND_DEBUG
+	zend_stack_init(&EG(overloaded_objects_stack));
 	original_sigsegv_handler = signal(SIGSEGV, zend_handle_sigsegv);
-#endif
-	EG(return_value_ptr_ptr) = &EG(global_return_value_ptr);
-	EG(global_return_value_ptr) = NULL;
-
+	EG(return_value) = &EG(global_return_value);
 	EG(symtable_cache_ptr) = EG(symtable_cache)-1;
 	EG(symtable_cache_limit)=EG(symtable_cache)+SYMTABLE_CACHE_SIZE-1;
 	EG(no_extensions)=0;
@@ -124,36 +86,33 @@ void init_executor(CLS_D ELS_DC)
 	EG(function_table) = CG(function_table);
 	EG(class_table) = CG(class_table);
 
-	EG(in_execution) = 0;
+	EG(AiCount) = 0;
+	zend_ptr_stack_init(&EG(garbage));
 
-	zend_ptr_stack_init(&EG(argument_stack));
-
-	zend_hash_init(&EG(symbol_table), 50, NULL, ZVAL_PTR_DTOR, 0);
+	EG(main_op_array) = NULL;
+	zend_hash_init(&EG(symbol_table), 50, NULL, PVAL_PTR_DTOR, 0);
 	EG(active_symbol_table) = &EG(symbol_table);
 
 	zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_activator);
-	EG(opline_ptr) = NULL;
-	EG(garbage_ptr) = 0;
 
-	zend_hash_init(&EG(included_files), 5, NULL, NULL, 0);
-
-	EG(ticks_count) = 0;
-
-	EG(user_error_handler) = NULL;
-
-	zend_ptr_stack_init(&EG(user_error_handlers));
-
-	EG(orig_error_reporting) = EG(error_reporting);
-
-#ifdef ZEND_WIN32
-	EG(timed_out) = 0;
-#endif
+	/* $GLOBALS array */
+	{
+		zval *globals = (zval *) emalloc(sizeof(zval));
+		
+		globals->value.ht = &EG(symbol_table);
+		globals->type = IS_ARRAY;
+		globals->refcount = 1;
+		globals->is_ref = 0;
+		zend_hash_update(&EG(symbol_table), "GLOBALS", sizeof("GLOBALS"), &globals, sizeof(zval *), NULL);
+	}
 }
 
 
 void shutdown_executor(ELS_D)
 {
+	zend_ptr_stack_destroy(&EG(function_symbol_table_stack));
 	zend_ptr_stack_destroy(&EG(arg_types_stack));
+	zend_stack_destroy(&EG(overloaded_objects_stack));
 			
 	while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
 		zend_hash_destroy(*EG(symtable_cache_ptr));
@@ -161,48 +120,20 @@ void shutdown_executor(ELS_D)
 		EG(symtable_cache_ptr)--;
 	}
 	zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_deactivator);
+	zend_ptr_stack_destroy(&EG(garbage));
 
 	zend_hash_destroy(&EG(symbol_table));
 
-	while (EG(garbage_ptr)--) {
-		if (EG(garbage)[EG(garbage_ptr)]->refcount==1) {
-			zval_ptr_dtor(&EG(garbage)[EG(garbage_ptr)]);
-		}
+	if (EG(main_op_array)) {
+		destroy_op_array(EG(main_op_array));
+		efree(EG(main_op_array));
 	}
-
-	zend_ptr_stack_destroy(&EG(argument_stack));
-
-	/* Destroy all op arrays */
-	zend_hash_apply(EG(function_table), (int (*)(void *)) is_not_internal_function);
-	zend_hash_apply(EG(class_table), (int (*)(void *)) is_not_internal_class);
-
-	zend_destroy_rsrc_list(ELS_C); /* must be destroyed after the main symbol table and
-									* op arrays are destroyed.
-									*/
-
 	clean_non_persistent_constants();
-#if ZEND_DEBUG
-	signal(SIGSEGV, original_sigsegv_handler);
-#endif
-
-	zend_hash_destroy(&EG(included_files));
-
-	if (EG(user_error_handler)) {
-		zval_dtor(EG(user_error_handler));
-		FREE_ZVAL(EG(user_error_handler));
-	}
-
-	zend_ptr_stack_clean(&EG(user_error_handlers), ZVAL_DESTRUCTOR, 1);
-	zend_ptr_stack_destroy(&EG(user_error_handlers));
-
-	EG(error_reporting) = EG(orig_error_reporting);
 }
 
 
-ZEND_API char *get_active_function_name()
+ZEND_API char *get_active_function_name(ELS_D)
 {
-	ELS_FETCH();
-
 	switch(EG(function_state_ptr)->function->type) {
 		case ZEND_USER_FUNCTION: {
 				char *function_name = ((zend_op_array *) EG(function_state_ptr)->function)->function_name;
@@ -225,33 +156,27 @@ ZEND_API char *get_active_function_name()
 
 ZEND_API char *zend_get_executed_filename(ELS_D)
 {
-	if (EG(active_op_array)) {
-		return EG(active_op_array)->filename;
-	} else {
-		return "[no active file]";
-	}
+	return active_opline->filename;
 }
 
 
 ZEND_API uint zend_get_executed_lineno(ELS_D)
 {
-	if (EG(opline_ptr)) {
-		return active_opline->lineno;
-	} else {
-		return 0;
+	return active_opline->lineno;
+}
+
+
+ZEND_API inline void safe_free_zval_ptr(zval *p)
+{
+	ELS_FETCH();
+
+	if (p!=EG(uninitialized_zval_ptr)) {
+		efree(p);
 	}
 }
 
 
-ZEND_API zend_bool zend_is_executing()
-{
-	ELS_FETCH();
-
-	return EG(in_execution);
-}
-
-
-ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
+ZEND_API void zval_ptr_dtor(zval **zval_ptr)
 {
 #if DEBUG_ZEND>=2
 	printf("Reducing refcount for %x (%x):  %d->%d\n", *zval_ptr, zval_ptr, (*zval_ptr)->refcount, (*zval_ptr)->refcount-1);
@@ -260,11 +185,44 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
 	if ((*zval_ptr)->refcount==0) {
 		zval_dtor(*zval_ptr);
 		safe_free_zval_ptr(*zval_ptr);
-	} else if (((*zval_ptr)->refcount == 1) && ((*zval_ptr)->type != IS_OBJECT)) {
-		(*zval_ptr)->is_ref = 0;
 	}
 }
-	
+
+
+ZEND_API inline int i_zend_is_true(zval *op)
+{
+	int result;
+
+	switch (op->type) {
+		case IS_LONG:
+		case IS_BOOL:
+		case IS_RESOURCE:
+			result = (op->value.lval?1:0);
+			break;
+		case IS_DOUBLE:
+			result = (op->value.dval ? 1 : 0);
+			break;
+		case IS_STRING:
+			if (op->value.str.len == 0
+				|| (op->value.str.len==1 && op->value.str.val[0]=='0')) {
+				result = 0;
+			} else {
+				result = 1;
+			}
+			break;
+		case IS_ARRAY:
+			result = (zend_hash_num_elements(op->value.ht)?1:0);
+			break;
+		case IS_OBJECT:
+			result = (zend_hash_num_elements(op->value.obj.properties)?1:0);
+			break;
+		default:
+			result = 0;
+			break;
+	}
+	return result;
+}
+
 
 ZEND_API int zend_is_true(zval *op)
 {
@@ -272,230 +230,111 @@ ZEND_API int zend_is_true(zval *op)
 }
 
 
-ZEND_API int zval_update_constant(zval **pp, void *arg)
+ZEND_API void zval_update_constant(zval *p)
 {
-	zval *p = *pp;
-	zend_bool inline_change = (zend_bool) (unsigned long) arg;
-
 	if (p->type == IS_CONSTANT) {
 		zval c;
-		int refcount;
-
-		SEPARATE_ZVAL(pp);
-		p = *pp;
-
-		refcount = p->refcount;
 
 		if (!zend_get_constant(p->value.str.val, p->value.str.len, &c)) {
 			zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
 						p->value.str.val,
 						p->value.str.val);
 			p->type = IS_STRING;
-			if (!inline_change) {
-				zval_copy_ctor(p);
-			}
 		} else {
-			if (inline_change) {
-				STR_FREE(p->value.str.val);
-			}
+			STR_FREE(p->value.str.val);
 			*p = c;
 		}
-		INIT_PZVAL(p);
-		p->refcount = refcount;
-	} else if (p->type == IS_CONSTANT_ARRAY) {
-		SEPARATE_ZVAL(pp);
-		p = *pp;
-		p->type = IS_ARRAY;
-		zend_hash_apply_with_argument(p->value.ht, (int (*)(void *,void *)) zval_update_constant, (void *) 1);
+		p->refcount = 1;
+		p->is_ref = 0;
 	}
-	return 0;
 }
 
-
-int call_user_function(HashTable *function_table, zval **object_pp, zval *function_name, zval *retval_ptr, int param_count, zval *params[])
-{
-	zval ***params_array = (zval ***) emalloc(sizeof(zval **)*param_count);
-	int i;
-	int ex_retval;
-	zval *local_retval_ptr;
-
-	for (i=0; i<param_count; i++) {
-		params_array[i] = &params[i];
-	}
-	ex_retval = call_user_function_ex(function_table, object_pp, function_name, &local_retval_ptr, param_count, params_array, 1, NULL);
-	if (local_retval_ptr) {
-		COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
-	} else {
-		INIT_ZVAL(*retval_ptr);
-	}
-	efree(params_array);
-	return ex_retval;
-}
-
-
-int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, int param_count, zval **params[], int no_separation, HashTable *symbol_table)
+int call_user_function(HashTable *function_table, zval *object, zval *function_name, zval *retval, int param_count, zval *params[])
 {
 	int i;
-	zval **original_return_value;
+	zval *original_return_value;
 	HashTable *calling_symbol_table;
 	zend_function_state function_state;
 	zend_function_state *original_function_state_ptr;
 	zend_op_array *original_op_array;
 	zend_op **original_opline_ptr;
-	int orig_free_op1, orig_free_op2;
-	int (*orig_unary_op)(zval *result, zval *op1);
-	int (*orig_binary_op)(zval *result, zval *op1, zval *op2);
+	CLS_FETCH();
 	ELS_FETCH();
 
-	*retval_ptr_ptr = NULL;
-
-	if (function_name->type==IS_ARRAY) { /* assume array($obj, $name) couple */
-		zval **tmp_object_ptr, **tmp_real_function_name;
-
-		if (zend_hash_index_find(function_name->value.ht, 0, (void **) &tmp_object_ptr)==FAILURE) {
+	if (object) {
+		if (object->type != IS_OBJECT) {
 			return FAILURE;
 		}
-		if (zend_hash_index_find(function_name->value.ht, 1, (void **) &tmp_real_function_name)==FAILURE) {
-			return FAILURE;
-		}
-		function_name = *tmp_real_function_name;
-		SEPARATE_ZVAL_IF_NOT_REF(tmp_object_ptr);
-		object_pp = tmp_object_ptr;
-		(*object_pp)->is_ref = 1;
+		function_table = &object->value.obj.ce->function_table;
+		/* unimplemented */
 	}
-
-	if (object_pp && !*object_pp) {
-		object_pp = NULL;
-	}
-	if (object_pp) {
-		if (Z_TYPE_PP(object_pp) == IS_OBJECT) {
-			function_table = &(*object_pp)->value.obj.ce->function_table;
-		} else if (Z_TYPE_PP(object_pp) == IS_STRING) {
-			zend_class_entry *ce;
-			char *lc_class;
-			int found;
-
-			lc_class = estrndup(Z_STRVAL_PP(object_pp), Z_STRLEN_PP(object_pp));
-			zend_str_tolower(lc_class, Z_STRLEN_PP(object_pp));
-			found = zend_hash_find(EG(class_table), lc_class, Z_STRLEN_PP(object_pp) + 1, (void **) &ce);
-			efree(lc_class);
-			if (found == FAILURE)
-				return FAILURE;
-
-			function_table = &ce->function_table;
-			object_pp = NULL;
-		} else
-			return FAILURE;
-	}
-
-	if (function_name->type!=IS_STRING) {
-		return FAILURE;
-	}
-
 	original_function_state_ptr = EG(function_state_ptr);
 	zend_str_tolower(function_name->value.str.val, function_name->value.str.len);
 	if (zend_hash_find(function_table, function_name->value.str.val, function_name->value.str.len+1, (void **) &function_state.function)==FAILURE) {
+		zend_error(E_ERROR, "Unknown function:  %s()\n", function_name->value.str.val);
 		return FAILURE;
 	}
 
+	zend_ptr_stack_push(&EG(function_symbol_table_stack), function_state.function_symbol_table);
+	function_state.function_symbol_table = (HashTable *) emalloc(sizeof(HashTable));
+	zend_hash_init(function_state.function_symbol_table, 0, NULL, PVAL_PTR_DTOR, 0);
+
 	for (i=0; i<param_count; i++) {
 		zval *param;
 
-		if (function_state.function->common.arg_types
-			&& i<function_state.function->common.arg_types[0]
-			&& function_state.function->common.arg_types[i+1]==BYREF_FORCE
-			&& !PZVAL_IS_REF(*params[i])) {
-			if ((*params[i])->refcount>1) {
-				zval *new_zval;
-
-				if (no_separation) {
-					return FAILURE;
-				}
-				ALLOC_ZVAL(new_zval);
-				*new_zval = **params[i];
-				zval_copy_ctor(new_zval);
-				new_zval->refcount = 1;
-				(*params[i])->refcount--;
-				*params[i] = new_zval;
-			}
-			(*params[i])->refcount++;
-			(*params[i])->is_ref = 1;
-			param = *params[i];
-		} else if (*params[i] != &EG(uninitialized_zval)) {
-			(*params[i])->refcount++;
-			param = *params[i];
-		} else {
-			ALLOC_ZVAL(param);
-			*param = **(params[i]);
-			INIT_PZVAL(param);
-		}
-		zend_ptr_stack_push(&EG(argument_stack), param);
+		param = (zval *) emalloc(sizeof(zval));
+		*param = *(params[i]);
+		param->refcount=1;
+		param->is_ref=0;
+		zval_copy_ctor(param);
+		zend_hash_next_index_insert_ptr(function_state.function_symbol_table, param, sizeof(zval *), NULL);
 	}
 
-	zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (long) param_count, NULL);
+	if (object) {
+		zval *dummy = (zval *) emalloc(sizeof(zval)), **this_ptr;
 
-	EG(function_state_ptr) = &function_state;
+		var_uninit(dummy);
+		dummy->refcount=1;
+		dummy->is_ref=0;
+		zend_hash_update_ptr(function_state.function_symbol_table, "this", sizeof("this"), dummy, sizeof(zval *), (void **) &this_ptr);
+		zend_assign_to_variable_reference(NULL, this_ptr, &object, NULL ELS_CC);
+	}
 
+	calling_symbol_table = EG(active_symbol_table);
+	EG(active_symbol_table) = function_state.function_symbol_table;
+	var_uninit(retval);
 	if (function_state.function->type == ZEND_USER_FUNCTION) {
-		calling_symbol_table = EG(active_symbol_table);
-		if (symbol_table) {
-			EG(active_symbol_table) = symbol_table;
-		} else {
-			ALLOC_HASHTABLE(EG(active_symbol_table));
-			zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0);
-		}
-		if (object_pp) {
-			zval *dummy, **this_ptr;
-				
-			ALLOC_ZVAL(dummy);
-			INIT_ZVAL(*dummy);	
-			zend_hash_update(EG(active_symbol_table), "this", sizeof("this"), &dummy, sizeof(zval *), (void **) &this_ptr);
-			zend_assign_to_variable_reference(NULL, this_ptr, object_pp, NULL ELS_CC);
-		}
-		original_return_value = EG(return_value_ptr_ptr);
+		original_return_value = EG(return_value);
 		original_op_array = EG(active_op_array);
-		EG(return_value_ptr_ptr) = retval_ptr_ptr;
+		EG(return_value) = retval;
 		EG(active_op_array) = (zend_op_array *) function_state.function;
-		original_opline_ptr = EG(opline_ptr);
-		orig_free_op1 = EG(free_op1);
-		orig_free_op2 = EG(free_op2);
-		orig_unary_op = EG(unary_op);
-		orig_binary_op = EG(binary_op);
+		original_opline_ptr = EG(opline_ptr);	
 		zend_execute(EG(active_op_array) ELS_CC);
-		if (!symbol_table) {
-			zend_hash_destroy(EG(active_symbol_table));
-			FREE_HASHTABLE(EG(active_symbol_table));
-		}
-		EG(active_symbol_table) = calling_symbol_table;
 		EG(active_op_array) = original_op_array;
-		EG(return_value_ptr_ptr)=original_return_value;
+		EG(return_value)=original_return_value;
 		EG(opline_ptr) = original_opline_ptr;
-		EG(free_op1) = orig_free_op1;
-		EG(free_op2) = orig_free_op2;
-		EG(unary_op) = orig_unary_op;
-		EG(binary_op) = orig_binary_op;
 	} else {
-		ALLOC_INIT_ZVAL(*retval_ptr_ptr);
-		((zend_internal_function *) function_state.function)->handler(param_count, *retval_ptr_ptr, (object_pp?*object_pp:NULL), 1 ELS_CC);
-		INIT_PZVAL(*retval_ptr_ptr);
+		((zend_internal_function *) function_state.function)->handler(EG(active_symbol_table), retval, &EG(regular_list), &EG(persistent_list));
 	}
-	zend_ptr_stack_clear_multiple(ELS_C);
+	zend_hash_destroy(EG(active_symbol_table));
+	efree(EG(active_symbol_table));
+	EG(active_symbol_table) = calling_symbol_table;
 	EG(function_state_ptr) = original_function_state_ptr;
+	function_state.function_symbol_table = zend_ptr_stack_pop(&EG(function_symbol_table_stack));
 
 	return SUCCESS;
 }
 
 
-ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name CLS_DC ELS_DC)
+ZEND_API void zend_eval_string(char *str, zval *retval CLS_DC ELS_DC)
 {
 	zval pv;
 	zend_op_array *new_op_array;
 	zend_op_array *original_active_op_array = EG(active_op_array);
 	zend_function_state *original_function_state_ptr = EG(function_state_ptr);
 	int original_handle_op_arrays;
-	int retval;
 
-	if (retval_ptr) {
+	if (retval) {
 		pv.value.str.len = strlen(str)+sizeof("return  ;")-1;
 		pv.value.str.val = emalloc(pv.value.str.len+1);
 		strcpy(pv.value.str.val, "return ");
@@ -511,48 +350,81 @@ ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name CLS
 
 	original_handle_op_arrays = CG(handle_op_arrays);
 	CG(handle_op_arrays) = 0;
-	new_op_array = compile_string(&pv, string_name CLS_CC);
+	new_op_array = compile_string(&pv CLS_CC);
 	CG(handle_op_arrays) = original_handle_op_arrays;
 
 	if (new_op_array) {
-		zval *local_retval_ptr=NULL;
-		zval **original_return_value_ptr_ptr = EG(return_value_ptr_ptr);
+		zval dummy_retval;
+		zval *original_return_value = EG(return_value);
 		zend_op **original_opline_ptr = EG(opline_ptr);
 		
-		EG(return_value_ptr_ptr) = &local_retval_ptr;
+		EG(return_value) = (retval?retval:&dummy_retval);
+		var_reset(EG(return_value));
 		EG(active_op_array) = new_op_array;
 		EG(no_extensions)=1;
-
 		zend_execute(new_op_array ELS_CC);
-
-		if (local_retval_ptr) {
-			if (retval_ptr) {
-				COPY_PZVAL_TO_ZVAL(*retval_ptr, local_retval_ptr);
-			} else {
-				zval_ptr_dtor(&local_retval_ptr);
-			}
-		} else {
-			if (retval_ptr) {
-				INIT_ZVAL(*retval_ptr);
-			}
-		}
-
 		EG(no_extensions)=0;
 		EG(opline_ptr) = original_opline_ptr;
 		EG(active_op_array) = original_active_op_array;
 		EG(function_state_ptr) = original_function_state_ptr;
 		destroy_op_array(new_op_array);
 		efree(new_op_array);
-		EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
-		retval = SUCCESS;
+		EG(return_value) = original_return_value;
+		if (!retval) {
+			zval_dtor(&dummy_retval);
+		}
 	} else {
-		retval = FAILURE;
+		printf("Failed executing:\n%s\n", str);
 	}
 	zval_dtor(&pv);
-	return retval;
 }
 
 
+ZEND_API inline void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts ELS_DC)
+{
+	zval *variable_ptr = *variable_ptr_ptr;
+	zval *value_ptr;
+	
+
+	if (!value_ptr_ptr) {
+		zend_error(E_ERROR, "Cannot create references to string offsets nor overloaded objects");
+		return;
+	}
+
+	value_ptr = *value_ptr_ptr;
+	if (variable_ptr == EG(error_zval_ptr) || value_ptr==EG(error_zval_ptr)) {
+		variable_ptr_ptr = &EG(uninitialized_zval_ptr);
+	} else if (variable_ptr!=value_ptr) {
+		variable_ptr->refcount--;
+		if (variable_ptr->refcount==0) {
+			zendi_zval_dtor(*variable_ptr);
+			efree(variable_ptr);
+		}
+
+		if (!value_ptr->is_ref) {
+			/* break it away */
+			value_ptr->refcount--;
+			if (value_ptr->refcount>0) {
+				*value_ptr_ptr = (zval *) emalloc(sizeof(zval));
+				**value_ptr_ptr = *value_ptr;
+				value_ptr = *value_ptr_ptr;
+				zendi_zval_copy_ctor(*value_ptr);
+			}
+			value_ptr->refcount=1;
+			value_ptr->is_ref=1;
+		}
+
+		*variable_ptr_ptr = value_ptr;
+		value_ptr->refcount++;
+	} else {
+		/* nothing to do */
+	}
+
+	if (result && (result->op_type != IS_UNUSED)) {
+		Ts[result->u.var].var = variable_ptr_ptr;
+	}
+}
+
 
 #if SUPPORT_INTERACTIVE
 void execute_new_code(CLS_D)
@@ -560,178 +432,14 @@ void execute_new_code(CLS_D)
 	ELS_FETCH();
 
 	if (!EG(interactive)
-		|| CG(active_op_array)->backpatch_count>0
-		|| CG(active_op_array)->function_name
-		|| CG(active_op_array)->type!=ZEND_USER_FUNCTION) {
+		|| CG(active_op_array)->backpatch_count>0) {
+		
 		return;
 	}
 	CG(active_op_array)->start_op_number = CG(active_op_array)->last_executed_op_number;
 	CG(active_op_array)->end_op_number = CG(active_op_array)->last;
 	EG(active_op_array) = CG(active_op_array);
 	zend_execute(CG(active_op_array) ELS_CC);
-	zval_ptr_dtor(EG(return_value_ptr_ptr));
 	CG(active_op_array)->start_op_number = CG(active_op_array)->last_executed_op_number;
 }
 #endif
-
-
-ZEND_API void zend_timeout(int dummy)
-{
-	ELS_FETCH();
-
-	/* is there any point in this?  we're terminating the request anyway...
-	PLS_FETCH();
-
-	PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
-	*/
-	zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
-			  EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
-}
-
-
-#ifdef ZEND_WIN32
-static LRESULT CALLBACK zend_timeout_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 
-{
-	switch (message) {
-		case WM_DESTROY:
-			PostQuitMessage(0);
-			break;
-		case WM_REGISTER_ZEND_TIMEOUT:
-			/* wParam is the thread id pointer, lParam is the timeout amount in seconds */
-			if (lParam==0) {
-				KillTimer(timeout_window, wParam);
-			} else {
-				SetTimer(timeout_window, wParam, lParam*1000, NULL);
-			}
-			break;
-		case WM_UNREGISTER_ZEND_TIMEOUT:
-			/* wParam is the thread id pointer */
-			KillTimer(timeout_window, wParam);
-			break;
-		case WM_TIMER: {
-#ifdef ZTS
-				zend_executor_globals *executor_globals;
-
-				executor_globals = ts_resource_ex(executor_globals_id, &wParam);
-				if (!executor_globals) {
-					/* Thread died before receiving its timeout? */
-					break;
-				}
-#endif
-				KillTimer(timeout_window, wParam);
-				EG(timed_out) = 1;
-			}
-			break;
-		default:
-			return DefWindowProc(hWnd,message,wParam,lParam);
-	}
-	return 0;
-}
-
-
-
-static unsigned __stdcall timeout_thread_proc(void *pArgs)
-{
-	MSG message;
-
-	wc.style=0;
-	wc.lpfnWndProc = zend_timeout_WndProc;
-	wc.cbClsExtra=0;
-	wc.cbWndExtra=0;
-	wc.hInstance=NULL;
-	wc.hIcon=NULL;
-	wc.hCursor=NULL;
-	wc.hbrBackground=(HBRUSH)(COLOR_BACKGROUND + 5);
-	wc.lpszMenuName=NULL;
-	wc.lpszClassName = "Zend Timeout Window";
-	if(!RegisterClass(&wc)) {
-		return -1;
-	}
-	timeout_window = CreateWindow(wc.lpszClassName, wc.lpszClassName, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL);
-	SetEvent(timeout_thread_event);
-	while (GetMessage(&message, NULL, 0, 0)) {
-		SendMessage(timeout_window, message.message, message.wParam, message.lParam);
-		if (message.message == WM_QUIT) {
-			break;
-		}
-	}
-	DestroyWindow(timeout_window);
-	UnregisterClass(wc.lpszClassName, NULL);
-	return 0;
-}
-
-
-void zend_init_timeout_thread()
-{
-	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
-	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
-	WaitForSingleObject(timeout_thread_event, INFINITE);
-}
-
-
-void zend_shutdown_timeout_thread()
-{
-	if (!timeout_thread_initialized) {
-		return;
-	}
-	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);
-}
-
-#endif
-
-/* This one doesn't exists on QNX */
-#ifndef SIGPROF
-#define SIGPROF 27
-#endif
-
-void zend_set_timeout(long seconds)
-{
-	ELS_FETCH();
-
-	EG(timeout_seconds) = seconds;
-#ifdef ZEND_WIN32
-	if (timeout_thread_initialized==0 && InterlockedIncrement(&timeout_thread_initialized)==1) {
-		/* We start up this process-wide thread here and not in zend_startup(), because if Zend
-		 * is initialized inside a DllMain(), you're not supposed to start threads from it.
-		 */
-		zend_init_timeout_thread();
-	}
-	PostThreadMessage(timeout_thread_id, WM_REGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) seconds);
-#else
-#	ifdef HAVE_SETITIMER
-	{
-		struct itimerval t_r;		/* timeout requested */
-		sigset_t sigset;
-
-		t_r.it_value.tv_sec = seconds;
-		t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
-
-		setitimer(ITIMER_PROF, &t_r, NULL);
-		signal(SIGPROF, zend_timeout);
-		sigemptyset(&sigset);
-		sigaddset(&sigset, SIGPROF);
-		sigprocmask(SIG_UNBLOCK,&sigset,NULL);
-	}
-#	endif
-#endif
-}
-
-
-void zend_unset_timeout(void)
-{
-	ELS_FETCH();
-
-#ifdef ZEND_WIN32
-	PostThreadMessage(timeout_thread_id, WM_UNREGISTER_ZEND_TIMEOUT, (WPARAM) GetCurrentThreadId(), (LPARAM) 0);
-#else
-#	ifdef HAVE_SETITIMER
-	{
-		struct itimerval no_timeout;
-
-		no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
-
-		setitimer(ITIMER_PROF, &no_timeout, NULL);
-	}
-#	endif
-#endif
-}

Zend/zend_execute_locks.h

@@ -1,22 +0,0 @@
-#ifndef ZEND_EXECUTE_LOCKS_H
-#define ZEND_EXECUTE_LOCKS_H
-
-#define PZVAL_LOCK(z)	((z)->refcount++)
-#define PZVAL_UNLOCK(z)	{ ((z)->refcount--);								\
-							if (!(z)->refcount) {							\
-								(z)->refcount = 1;							\
-								(z)->is_ref = 0;							\
-								if (EG(garbage_ptr) == 4) {					\
-									zval_ptr_dtor(&EG(garbage)[0]);			\
-									zval_ptr_dtor(&EG(garbage)[1]);			\
-									EG(garbage)[0] = EG(garbage)[2];		\
-									EG(garbage)[1] = EG(garbage)[3];		\
-									EG(garbage_ptr) -= 2;					\
-								}											\
-								EG(garbage)[EG(garbage_ptr)++] = (z);		\
-							}												\
-						}
-
-#define SELECTIVE_PZVAL_LOCK(pzv, pzn)		if (!((pzn)->u.EA.type & EXT_TYPE_UNUSED)) { PZVAL_LOCK(pzv); }
-
-#endif /* ZEND_EXECUTE_LOCKS_H */

Zend/zend_extensions.c

@@ -2,215 +2,122 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
 #include "zend_extensions.h"
 
 ZEND_API zend_llist zend_extensions;
 static int last_resource_number;
 
+int zend_load_extensions(char **extension_paths)
+{
+	char **p = extension_paths;
+
+	if (!p) {
+		return SUCCESS;
+	}
+	while (*p) {
+		if (zend_load_extension(*p)==FAILURE) {
+			return FAILURE;
+		}
+		p++;
+	}
+	return SUCCESS;
+}
+
+
 int zend_load_extension(char *path)
 {
 #if ZEND_EXTENSIONS_SUPPORT
 	DL_HANDLE handle;
-	zend_extension *new_extension;
+	zend_extension extension, *new_extension;
 	zend_extension_version_info *extension_version_info;
 
 	handle = DL_LOAD(path);
 	if (!handle) {
-#ifndef ZEND_WIN32
-		fprintf(stderr, "Failed loading %s:  %s\n", path, dlerror());
-#else
-		fprintf(stderr, "Failed loading %s\n", path);
-#endif
+		zend_printf("Failed loading %s\n", path);
 		return FAILURE;
 	}
 
 	extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info");
 	new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry");
 	if (!extension_version_info || !new_extension) {
-		fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path);
+		zend_printf("%s doesn't appear to be a valid Zend extension\n", path);
 		return FAILURE;
 	}
 
-
-	/* allow extension to proclaim compatibility with any Zend version */
-	if(extension_version_info->zend_extension_api_no != ZEND_EXTENSION_API_NO &&(!new_extension->api_no_check || new_extension->api_no_check(ZEND_EXTENSION_API_NO) != SUCCESS)) {
-		if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s requires Zend Engine API version %d\n"
-					"The installed Zend Engine API version is %d\n\n",
+	if (extension_version_info->zend_extension_api_no > ZEND_EXTENSION_API_NO) {
+		zend_printf("%s requires Zend version %s or later\n"
+					"Current version %s, API version %d\n",
 					new_extension->name,
-					extension_version_info->zend_extension_api_no,
+					extension_version_info->required_zend_version,
+					ZEND_VERSION,
 					ZEND_EXTENSION_API_NO);
-			DL_UNLOAD(handle);
-			return FAILURE;
-		} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
-			fprintf(stderr, "%s designed to be used with the Zend Engine API %d is outdated\n"
-					"It requires a more recent version of the Zend Engine\n"
-					"The installed Zend Engine API version is %d\n"
-					"Contact %s at %s for a later version of this module.\n\n",
+		return FAILURE;
+	} else if (extension_version_info->zend_extension_api_no < ZEND_EXTENSION_API_NO) {
+		/* we may be able to allow for downwards compatability in some harmless cases. */
+		zend_printf("%s is outdated (API version %d, current version %d)\n"
+					"Contact %s at %s for a later version of this module.\n",
 					new_extension->name,
 					extension_version_info->zend_extension_api_no,
 					ZEND_EXTENSION_API_NO,
 					new_extension->author,
 					new_extension->URL);
-			DL_UNLOAD(handle);
-			return FAILURE;
-		} 
+		return FAILURE;
 	} else if (ZTS_V!=extension_version_info->thread_safe) {
-		fprintf(stderr, "Cannot load %s - it %s thread safe, whereas Zend %s\n",
+		zend_printf("Cannot load %s - it %s thread safe, whereas Zend %s\n",
 					new_extension->name,
 					(extension_version_info->thread_safe?"is":"isn't"),
 					(ZTS_V?"is":"isn't"));
-		DL_UNLOAD(handle);
-		return FAILURE;
-	} else if (ZEND_DEBUG!=extension_version_info->debug) {
-		fprintf(stderr, "Cannot load %s - it %s debug information, whereas Zend %s\n",
-					new_extension->name,
-					(extension_version_info->debug?"contains":"does not contain"),
-					(ZEND_DEBUG?"does":"does not"));
-		DL_UNLOAD(handle);
 		return FAILURE;
 	}
 
-	return zend_register_extension(new_extension, handle);
-#else
-	fprintf(stderr, "Extensions are not supported on this platform.\n");
-	return FAILURE;
-#endif
-}
-
-
-int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle)
-{
-#if ZEND_EXTENSIONS_SUPPORT
-	zend_extension extension;
-
+	if (new_extension->startup) {
+		new_extension->startup(new_extension);
+	}
 	extension = *new_extension;
 	extension.handle = handle;
 
-	zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
-
 	zend_llist_add_element(&zend_extensions, &extension);
 
-	/*fprintf(stderr, "Loaded %s, version %s\n", extension.name, extension.version);*/
-#endif
+	/*zend_printf("Loaded %s, version %s\n", extension.name, extension.version);*/
 
+	zend_append_version_info(&extension);
 	return SUCCESS;
-}
-
-
-static void zend_extension_shutdown(zend_extension *extension)
-{
-#if ZEND_EXTENSIONS_SUPPORT
-	if (extension->shutdown) {
-		extension->shutdown(extension);
-	}
+#else
+	zend_printf("Extensions are not supported on this platform.\n");
+	return FAILURE
 #endif
 }
 
-static int zend_extension_startup(zend_extension *extension)
-{
-#if ZEND_EXTENSIONS_SUPPORT
-	if (extension->startup) {
-		if (extension->startup(extension)!=SUCCESS) {
-			return 1;
-		}
-		zend_append_version_info(extension);
-	}
-#endif
-	return 0;
-}
-
-
-int zend_startup_extensions_mechanism()
-{
-	/* Startup extensions mechanism */
-	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
-	last_resource_number = 0;
-	return SUCCESS;
-}
-
-
-int zend_startup_extensions()
-{
-	zend_llist_apply_with_del(&zend_extensions, (int (*)(void *)) zend_extension_startup);
-	return SUCCESS;
-}
-
-
-void zend_shutdown_extensions()
-{
-	zend_llist_apply(&zend_extensions, (void (*)(void *)) zend_extension_shutdown);
-	zend_llist_destroy(&zend_extensions);
-}
-
 
 void zend_extension_dtor(zend_extension *extension)
 {
-#if ZEND_EXTENSIONS_SUPPORT && !ZEND_DEBUG
-	if (extension->handle) {
-		DL_UNLOAD(extension->handle);
+#if ZEND_EXTENSIONS_SUPPORT
+	if (extension->shutdown) {
+		extension->shutdown(extension);
 	}
+	DL_UNLOAD(extension->handle);
 #endif
 }
 
 
-static void zend_extension_message_dispatcher(zend_extension *extension, int num_args, va_list args)
-{
-	int message;
-	void *arg;
-
-	if (!extension->message_handler || num_args!=2) {
-		return;
-	}
-	message = va_arg(args, int);
-	arg = va_arg(args, void *);
-	extension->message_handler(message, arg);
-}
-
-
-ZEND_API void zend_extension_dispatch_message(int message, void *arg)
-{
-	zend_llist_apply_with_arguments(&zend_extensions, (llist_apply_with_args_func_t) zend_extension_message_dispatcher, 2, message, arg);
-}
-
-
 ZEND_API int zend_get_resource_handle(zend_extension *extension)
 {
-	if (last_resource_number<ZEND_MAX_RESERVED_RESOURCES) {
+	if (last_resource_number<4) {
 		extension->resource_number = last_resource_number;
-		return last_resource_number++;
+		return last_resource_number;
 	} else {
 		return -1;
 	}
 }
-
-
-ZEND_API zend_extension *zend_get_extension(char *extension_name)
-{
-	zend_llist_element *element;
-
-	for (element = zend_extensions.head; element; element = element->next) {
-		zend_extension *extension = (zend_extension *) element->data;
-
-		if (!strcmp(extension->name, extension_name)) {
-			return extension;
-		}
-	}
-	return NULL;
-}

Zend/zend_extensions.h

@@ -2,56 +2,34 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_EXTENSIONS_H
-#define ZEND_EXTENSIONS_H
+#ifndef _ZEND_EXTENSIONS_H
+#define _ZEND_EXTENSIONS_H
 
 #include "zend_compile.h"
 
-#define ZEND_EXTENSION_API_NO	20001224
+#define ZEND_EXTENSION_API_NO		2
 
-typedef struct _zend_extension_version_info {
+typedef struct {
 	int zend_extension_api_no;
 	char *required_zend_version;
 	unsigned char thread_safe;
-	unsigned char debug;
 } zend_extension_version_info;
 
 
 typedef struct _zend_extension zend_extension;
 
-/* Typedef's for zend_extension function pointers */
-typedef int (*startup_func_t)(zend_extension *extension);
-typedef void (*shutdown_func_t)(zend_extension *extension);
-typedef void (*activate_func_t)(void);
-typedef void (*deactivate_func_t)(void);
-
-typedef void (*message_handler_func_t)(int message, void *arg);
-
-typedef void (*op_array_handler_func_t)(zend_op_array *op_array);
-
-typedef void (*statement_handler_func_t)(zend_op_array *op_array);
-typedef void (*fcall_begin_handler_func_t)(zend_op_array *op_array);
-typedef void (*fcall_end_handler_func_t)(zend_op_array *op_array);
-
-typedef void (*op_array_ctor_func_t)(zend_op_array *op_array);
-typedef void (*op_array_dtor_func_t)(zend_op_array *op_array);
-
 struct _zend_extension {
 	char *name;
 	char *version;
@@ -59,23 +37,21 @@ struct _zend_extension {
 	char *URL;
 	char *copyright;
 
-	startup_func_t startup;
-	shutdown_func_t shutdown;
-	activate_func_t activate;
-	deactivate_func_t deactivate;
+	void (*startup)(zend_extension *extension);
+	void (*shutdown)(zend_extension *extension);
+	void (*activate)();
+	void (*deactivate)();
 
-	message_handler_func_t message_handler;
+	void (*op_array_handler)(zend_op_array *op_array);
+	
+	void (*statement_handler)(zend_op_array *op_array);
+	void (*fcall_begin_handler)(zend_op_array *op_array);
+	void (*fcall_end_handler)(zend_op_array *op_array);
 
-	op_array_handler_func_t op_array_handler;
+	void (*op_array_ctor)(void **resource);
+	void (*op_array_dtor)(void **resource);
 
-	statement_handler_func_t statement_handler;	
-	fcall_begin_handler_func_t fcall_begin_handler;
-	fcall_end_handler_func_t fcall_end_handler;
-
-	op_array_ctor_func_t op_array_ctor;
-	op_array_dtor_func_t op_array_dtor;
-
-	int (*api_no_check)(int api_no);
+	void *reserved1;
 	void *reserved2;
 	void *reserved3;
 	void *reserved4;
@@ -89,28 +65,26 @@ struct _zend_extension {
 };
 
 
-ZEND_API int zend_get_resource_handle(zend_extension *extension);
-ZEND_API void zend_extension_dispatch_message(int message, void *arg);
+ZEND_API int zend_get_resource_handle();
 
-#define ZEND_EXTMSG_NEW_EXTENSION		1
+#ifdef ZTS
+#define ZTS_V 1
+#else
+#define ZTS_V 0
+#endif
 
 
 #define ZEND_EXTENSION()	\
-	ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, ZEND_VERSION, ZTS_V, ZEND_DEBUG }
+	ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.80A", ZTS_V }
 
 #define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
-#define COMPAT_ZEND_EXTENSION_PROPERTIES   NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
 
 
 ZEND_API extern zend_llist zend_extensions;
 
 void zend_extension_dtor(zend_extension *extension);
-ZEND_API int zend_load_extension(char *path);
-ZEND_API int zend_register_extension(zend_extension *new_extension, DL_HANDLE handle);
+int zend_load_extension(char *path);
+int zend_load_extensions(char **extension_paths);
 void zend_append_version_info(zend_extension *extension);
-int zend_startup_extensions_mechanism(void);
-int zend_startup_extensions(void);
-void zend_shutdown_extensions(void);
-ZEND_API zend_extension *zend_get_extension(char *extension_name);
 
-#endif /* ZEND_EXTENSIONS_H */
+#endif /* _ZEND_EXTENSIONS_H */

Zend/zend_fast_cache.h

@@ -1,140 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_FAST_CACHE_H
-#define ZEND_FAST_CACHE_H
-
-#ifndef ZEND_ENABLE_FAST_CACHE
-# if ZEND_DEBUG
-# define ZEND_ENABLE_FAST_CACHE 0
-# else
-# define ZEND_ENABLE_FAST_CACHE 1
-# endif
-#endif
-
-typedef struct _zend_fast_cache_list_entry {
-	struct _zend_fast_cache_list_entry *next;
-} zend_fast_cache_list_entry;
-
-#define MAX_FAST_CACHE_TYPES	4
-
-
-#define ZVAL_CACHE_LIST			0
-#define HASHTABLE_CACHE_LIST	1
-
-#if ZEND_ENABLE_FAST_CACHE
-
-
-#include "zend_globals.h"
-#include "zend_globals_macros.h"
-#include "zend_alloc.h"
-
-
-#if ZEND_DEBUG
-# define RECORD_ZVAL_CACHE_HIT(fc_type)		AG(fast_cache_stats)[fc_type][1]++;
-# define RECORD_ZVAL_CACHE_MISS(fc_type)	AG(fast_cache_stats)[fc_type][0]++;
-#else
-# define RECORD_ZVAL_CACHE_HIT(fc_type)
-# define RECORD_ZVAL_CACHE_MISS(fc_type)
-#endif
-
-
-#define ZEND_FAST_ALLOC(p, type, fc_type)								\
-	{																\
-		ALS_FETCH();												\
-																	\
-		if (((p) = (type *) AG(fast_cache_list_head)[fc_type])) {	\
-			AG(fast_cache_list_head)[fc_type] = ((zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type])->next;	\
-			RECORD_ZVAL_CACHE_HIT(fc_type);							\
-		} else {													\
-			(p) = (type *) emalloc(sizeof(type));					\
-			RECORD_ZVAL_CACHE_MISS(fc_type);						\
-		}															\
-	}
-
-
-#define ZEND_FAST_FREE(p, fc_type)										\
-	{																\
-		ALS_FETCH();												\
-																	\
-		((zend_fast_cache_list_entry *) (p))->next = (zend_fast_cache_list_entry *) AG(fast_cache_list_head)[fc_type];	\
-		AG(fast_cache_list_head)[fc_type] = (zend_fast_cache_list_entry *) (p);			\
-	}
-
-#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
-	ZEND_FAST_ALLOC(p, type, fc_type)
-
-#define ZEND_FAST_FREE_REL(p, fc_type)	\
-	ZEND_FAST_FREE(p, fc_type)
-
-
-#else /* !ZEND_ENABLE_FAST_CACHE */
-
-#define ZEND_FAST_ALLOC(p, type, fc_type)	\
-	(p) = (type *) emalloc(sizeof(type))
-
-#define ZEND_FAST_FREE(p, fc_type)	\
-	efree(p)
-
-#define ZEND_FAST_ALLOC_REL(p, type, fc_type)	\
-	(p) = (type *) emalloc_rel(sizeof(type))
-
-#define ZEND_FAST_FREE_REL(p, fc_type)	\
-	efree_rel(p)
-
-#endif /* ZEND_ENABLE_FAST_CACHE */
-
-
-
-
-/* fast cache for zval's */
-#define ALLOC_ZVAL(z)	\
-	ZEND_FAST_ALLOC(z, zval, ZVAL_CACHE_LIST)
-
-#define FREE_ZVAL(z)	\
-	ZEND_FAST_FREE(z, ZVAL_CACHE_LIST)
-
-#define ALLOC_ZVAL_REL(z)	\
-	ZEND_FAST_ALLOC_REL(z, zval, ZVAL_CACHE_LIST)
-
-#define FREE_ZVAL_REL(z)	\
-	ZEND_FAST_FREE_REL(z, ZVAL_CACHE_LIST)
-
-/* fast cache for HashTables */
-#define ALLOC_HASHTABLE(ht)	\
-	ZEND_FAST_ALLOC(ht, HashTable, HASHTABLE_CACHE_LIST)
-
-#define FREE_HASHTABLE(ht)	\
-	ZEND_FAST_FREE(ht, HASHTABLE_CACHE_LIST)
-
-#define ALLOC_HASHTABLE_REL(ht)	\
-	ZEND_FAST_ALLOC_REL(ht, HashTable, HASHTABLE_CACHE_LIST)
-
-#define FREE_HASHTABLE_REL(ht)	\
-	ZEND_FAST_FREE_REL(ht, HASHTABLE_CACHE_LIST)
-
-#endif /* ZEND_FAST_CACHE_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

Zend/zend_globals.h

@@ -2,75 +2,111 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_GLOBALS_H
-#define ZEND_GLOBALS_H
-
+#ifndef _ZEND_GLOBALS_H
+#define _ZEND_GLOBALS_H
 
 #include <setjmp.h>
 
-#include "zend_globals_macros.h"
-
 #include "zend_stack.h"
 #include "zend_ptr_stack.h"
 #include "zend_hash.h"
 #include "zend_llist.h"
-#include "zend_fast_cache.h"
 
-/* Define ZTS if you want a thread-safe Zend */
-/*#undef ZTS*/
+#undef ZTS
 
 #ifdef ZTS
-#include "../TSRM/TSRM.h"
+#include "SAPI.h"
 
-#ifdef __cplusplus
-class ZendFlexLexer;
-class ZendIniFlexLexer;
+extern int compiler_globals_id;
+extern int executor_globals_id;
 #endif
 
-BEGIN_EXTERN_C()
-ZEND_API extern int compiler_globals_id;
-ZEND_API extern int executor_globals_id;
-ZEND_API extern int alloc_globals_id;
-END_EXTERN_C()
-
-#endif
+typedef struct _zend_compiler_globals zend_compiler_globals;
+typedef struct _zend_executor_globals zend_executor_globals;
+typedef struct _zend_alloc_globals zend_alloc_globals;
 
 #define SYMTABLE_CACHE_SIZE 32
 
 
+/* Compiler */
+#ifdef ZTS
+# define CLS_D	zend_compiler_globals *compiler_globals
+# define CLS_DC	, CLS_D
+# define CLS_C	compiler_globals
+# define CLS_CC , CLS_C
+# define CG(v) (((zend_compiler_globals *) compiler_globals)->v)
+# define CLS_FETCH()	zend_compiler_globals *compiler_globals = ts_resource(compiler_globals_id)
+# define YYPARSE_PARAM compiler_globals
+# define YYLEX_PARAM compiler_globals
+int zendparse(void *compiler_globals);
+#else
+# define CLS_D
+# define CLS_DC
+# define CLS_C
+# define CLS_CC
+# define CG(v) (compiler_globals.v)
+# define CLS_FETCH()
+extern ZEND_API zend_compiler_globals compiler_globals;
+int zendparse();
+#endif
+
+
+/* Executor */
+#ifdef ZTS
+# define ELS_D	zend_executor_globals *executor_globals
+# define ELS_DC	, ELS_D
+# define ELS_C	executor_globals
+# define ELS_CC , ELS_C
+# define EG(v) (executor_globals->v)
+# define ELS_FETCH()	zend_executor_globals *executor_globals = ts_resource(executor_globals_id)
+#else
+# define ELS_D
+# define ELS_DC
+# define ELS_C
+# define ELS_CC
+# define EG(v) (executor_globals.v)
+# define ELS_FETCH()
+extern ZEND_API zend_executor_globals executor_globals;
+#endif
+
+
+/* Memory Manager */
+#ifdef ZTS
+# define ALS_D	zend_alloc_globals *alloc_globals
+# define ALS_DC	, ALS_D
+# define ALS_C	alloc_globals
+# define ALS_CC , ALS_C
+# define AG(v) (((zend_alloc_globals *) alloc_globals)->v)
+# define ALS_FETCH()	zend_alloc_globals *alloc_globals = ts_resource(alloc_globals_id)
+#else
+# define ALS_D
+# define ALS_DC
+# define ALS_C
+# define ALS_CC
+# define AG(v) (alloc_globals.v)
+# define ALS_FETCH()
+#endif
+
+
 #include "zend_compile.h"
-
-/* excpt.h on Digital Unix 4.0 defines function_table */
-#undef function_table
-
-
-typedef struct _zend_declarables {
-	zval ticks;
-} zend_declarables;
-
+#include "zend_execute.h"
 
 struct _zend_compiler_globals {
 	zend_stack bp_stack;
 	zend_stack switch_cond_stack;
-	zend_stack foreach_copy_stack;
 	zend_stack object_stack;
-	zend_stack declare_stack;
 
 	zend_class_entry class_entry, *active_class_entry;
 
@@ -83,7 +119,6 @@ struct _zend_compiler_globals {
 	char *compiled_filename;
 
 	int zend_lineno;
-	int comment_start_line;
 	char *heredoc;
 	int heredoc_len;
 
@@ -92,36 +127,19 @@ struct _zend_compiler_globals {
 	HashTable *function_table;	/* function symbol table */
 	HashTable *class_table;		/* class table */
 
-	HashTable filenames_table;
+	zend_llist filenames_list;
 
-	zend_bool in_compilation;
-	zend_bool short_tags;
-	zend_bool asp_tags;
-	zend_bool allow_call_time_pass_reference;
-
-	zend_declarables declarables;
+	unsigned char short_tags;
+	unsigned char asp_tags;
 
 	/* For extensions support */
-	zend_bool extended_info;	/* generate extension information for debugger/profiler */
-	zend_bool handle_op_arrays;	/* run op_arrays through op_array handlers */
-
-	zend_bool unclean_shutdown;
-
-	zend_bool ini_parser_unbuffered_errors;
-
-	zend_llist open_files;
-#if defined(ZTS) && defined(__cplusplus)
-	ZendFlexLexer *ZFL;
-	ZendIniFlexLexer *ini_scanner;
-#else
-	void *ZFL;
-	void *ini_parser;
-#endif
+	unsigned char extended_info;	/* generate extension information for debugger/profiler */
+	unsigned char handle_op_arrays;	/* run op_arrays through op_array handlers */
 };
 
 
 struct _zend_executor_globals {
-	zval **return_value_ptr_ptr;
+	zval *return_value;
 
 	zval uninitialized_zval;
 	zval *uninitialized_zval_ptr;
@@ -130,10 +148,10 @@ struct _zend_executor_globals {
 	zval *error_zval_ptr;
 
 	zend_function_state *function_state_ptr;
+	zend_ptr_stack function_symbol_table_stack;
 	zend_ptr_stack arg_types_stack;
-
-	/* for global return() support */
-	zval *global_return_value_ptr;
+	zend_stack overloaded_objects_stack;
+	zval global_return_value;
 
 	/* symbol table cache */
 	HashTable *symtable_cache[SYMTABLE_CACHE_SIZE];
@@ -145,15 +163,12 @@ struct _zend_executor_globals {
 	HashTable *active_symbol_table;
 	HashTable symbol_table;		/* main symbol table */
 
-	HashTable included_files;	/* files already included */
-
 	jmp_buf bailout;
 
 	int error_reporting;
-	int orig_error_reporting;
-	int exit_status;
 
 	zend_op_array *active_op_array;
+	zend_op_array *main_op_array;
 
 	HashTable *function_table;	/* function symbol table */
 	HashTable *class_table;		/* class table */
@@ -161,57 +176,29 @@ struct _zend_executor_globals {
 
 	long precision;
 
-	int ticks_count;
+	unsigned int AiCount;
 
-	zend_bool in_execution;
+	zend_ptr_stack garbage;
 
 	/* for extended information support */
-	zend_bool no_extensions;
-
-#ifdef ZEND_WIN32
-	zend_bool timed_out;
-#endif
+	unsigned char no_extensions;
 
 	HashTable regular_list;
 	HashTable persistent_list;
 
-	zend_ptr_stack argument_stack;
-	int free_op1, free_op2;
-	int (*unary_op)(zval *result, zval *op1);
-	int (*binary_op)(zval *result, zval *op1, zval *op2);
-
-	zval *garbage[4];
-	int garbage_ptr;
-
-	zval *user_error_handler;
-	zend_ptr_stack user_error_handlers;
-
-	/* timeout support */
-	int timeout_seconds;
-
-	int lambda_count;
-
-	HashTable ini_directives;
-
-	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
 #if SUPPORT_INTERACTIVE
 	int interactive;
 #endif
 };
 
 
-struct _zend_alloc_globals {
-	zend_mem_header *head;		/* standard list */
-	zend_mem_header *phead;		/* persistent list */
-	void *cache[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
-	unsigned int cache_count[MAX_CACHED_MEMORY];
-	void *fast_cache_list_head[MAX_FAST_CACHE_TYPES];
 
-#if ZEND_DEBUG
-	/* for performance tuning */
-	int cache_stats[MAX_CACHED_MEMORY][2];
-	int fast_cache_stats[MAX_FAST_CACHE_TYPES][2];
-#endif
+struct _zend_alloc_globals {
+	mem_header *head;		/* standard list */
+	mem_header *phead;		/* persistent list */
+	void *cache[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+	unsigned char cache_count[MAX_CACHED_MEMORY];
+
 #if MEMORY_LIMIT
 	unsigned int memory_limit;
 	unsigned int allocated_memory;
@@ -219,4 +206,5 @@ struct _zend_alloc_globals {
 #endif
 };
 
-#endif /* ZEND_GLOBALS_H */
+
+#endif /* _ZEND_GLOBALS_H */

Zend/zend_globals_macros.h

@@ -1,89 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_GLOBALS_MACROS_H
-#define ZEND_GLOBALS_MACROS_H
-
-typedef struct _zend_compiler_globals zend_compiler_globals;
-typedef struct _zend_executor_globals zend_executor_globals;
-typedef struct _zend_alloc_globals zend_alloc_globals;
-
-/* Compiler */
-#ifdef ZTS
-# define CLS_D	zend_compiler_globals *compiler_globals
-# define CLS_DC	, CLS_D
-# define CLS_C	compiler_globals
-# define CLS_CC , CLS_C
-# define CG(v) (((zend_compiler_globals *) compiler_globals)->v)
-# define CLS_FETCH()	zend_compiler_globals *compiler_globals = (zend_compiler_globals *) ts_resource(compiler_globals_id)
-BEGIN_EXTERN_C()
-int zendparse(void *compiler_globals);
-END_EXTERN_C()
-#else
-# define CLS_D	void
-# define CLS_DC
-# define CLS_C
-# define CLS_CC
-# define CG(v) (compiler_globals.v)
-# define CLS_FETCH()
-extern ZEND_API struct _zend_compiler_globals compiler_globals;
-int zendparse(void);
-#endif
-
-
-/* Executor */
-#ifdef ZTS
-# define ELS_D	zend_executor_globals *executor_globals
-# define ELS_DC	, ELS_D
-# define ELS_C	executor_globals
-# define ELS_CC , ELS_C
-# define EG(v) (executor_globals->v)
-# define ELS_FETCH()	zend_executor_globals *executor_globals = (zend_executor_globals *) ts_resource(executor_globals_id)
-#else
-# define ELS_D	void
-# define ELS_DC
-# define ELS_C
-# define ELS_CC
-# define EG(v) (executor_globals.v)
-# define ELS_FETCH()
-extern ZEND_API zend_executor_globals executor_globals;
-#endif
-
-
-/* Memory Manager */
-#ifdef ZTS
-# define ALS_D	zend_alloc_globals *alloc_globals
-# define ALS_DC	, ALS_D
-# define ALS_C	alloc_globals
-# define ALS_CC , ALS_C
-# define AG(v) (((zend_alloc_globals *) alloc_globals)->v)
-# define ALS_FETCH()	zend_alloc_globals *alloc_globals = (zend_alloc_globals *) ts_resource(alloc_globals_id)
-#else
-# define ALS_D	void
-# define ALS_DC
-# define ALS_C
-# define ALS_CC
-# define AG(v) (alloc_globals.v)
-# define ALS_FETCH()
-extern ZEND_API zend_alloc_globals alloc_globals;
-#endif
-
-#endif /* ZEND_GLOBALS_MACROS_H */
-

Zend/zend_hash.h

@@ -2,23 +2,21 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-#ifndef ZEND_HASH_H
-#define ZEND_HASH_H
+
+#ifndef _HASH_
+#define _HASH_
 
 #include <sys/types.h>
 
@@ -29,58 +27,42 @@
 #define HASH_UPDATE 		(1<<0)
 #define HASH_ADD			(1<<1)
 #define HASH_NEXT_INSERT	(1<<2)
+#define HASH_ADD_PTR		(1<<3)
 
 #define HASH_DEL_KEY 0
 #define HASH_DEL_INDEX 1
 
-typedef int  (*compare_func_t)(const void *, const void *);
-typedef void (*sort_func_t)(void *, size_t, register size_t, compare_func_t);
-typedef void (*dtor_func_t)(void *pDest);
-typedef int (*apply_func_t)(void *pDest);
-typedef int (*apply_func_arg_t)(void *pDest, void *argument);
-typedef ulong (*hash_func_t)(char *arKey, uint nKeyLength);
-typedef void (*copy_ctor_func_t)(void *pElement);
-
-struct _hashtable;
+struct hashtable;
 
 typedef struct bucket {
 	ulong h;						/* Used for numeric indexing */
 	uint nKeyLength;
 	void *pData;
 	void *pDataPtr;
+	char bIsPointer;
 	struct bucket *pListNext;
 	struct bucket *pListLast;
 	struct bucket *pNext;
-	struct bucket *pLast;
 	char arKey[1]; /* Must be last element */
 } Bucket;
 
-typedef struct _hashtable {
+typedef struct hashtable {
 	uint nTableSize;
 	uint nHashSizeIndex;
 	uint nNumOfElements;
 	ulong nNextFreeElement;
-	hash_func_t pHashFunction;
+	ulong(*pHashFunction) (char *arKey, uint nKeyLength);
 	Bucket *pInternalPointer;	/* Used for element traversal */
 	Bucket *pListHead;
 	Bucket *pListTail;
 	Bucket **arBuckets;
-	dtor_func_t pDestructor;
-	zend_bool persistent;
-	unsigned char nApplyCount;
-	zend_bool bApplyProtection;
-#if ZEND_DEBUG
-	int inconsistent;
-#endif
+	void (*pDestructor) (void *pData);
+	unsigned char persistent;
 } HashTable;
 
-typedef Bucket* HashPosition;
-
-BEGIN_EXTERN_C()
 
 /* startup/shutdown */
-ZEND_API int zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent);
-ZEND_API int zend_hash_init_ex(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, int persistent, zend_bool bApplyProtection);
+ZEND_API int zend_hash_init(HashTable *ht, uint nSize, ulong(*pHashFunction) (char *arKey, uint nKeyLength), void (*pDestructor) (void *pData), int persistent);
 ZEND_API void zend_hash_destroy(HashTable *ht);
 
 ZEND_API void zend_hash_clean(HashTable *ht);
@@ -91,36 +73,34 @@ ZEND_API int zend_hash_add_or_update(HashTable *ht, char *arKey, uint nKeyLength
 		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_add(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
 		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,nDataSize,pDest,HASH_ADD)
+#define zend_hash_update_ptr(ht,arKey,nKeyLength,pData,nDataSize,pDest) \
+		zend_hash_add_or_update(ht,arKey,nKeyLength,pData,0,pDest,(HASH_UPDATE|HASH_ADD_PTR))
 
 ZEND_API int zend_hash_quick_add_or_update(HashTable *ht, char *arKey, uint nKeyLength, ulong h, void *pData, uint nDataSize, void **pDest,int flag);
 #define zend_hash_quick_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
 		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_quick_add(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
 		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,nDataSize,pDest,HASH_ADD)
+#define zend_hash_quick_update_ptr(ht,arKey,nKeyLength,h,pData,nDataSize,pDest) \
+		zend_hash_quick_add_or_update(ht,arKey,nKeyLength,h,pData,0,pDest,HASH_UPDATE|HASH_ADD_PTR)
 
 ZEND_API int zend_hash_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, uint nDataSize, void **pDest, int flag);
 #define zend_hash_index_update(ht,h,pData,nDataSize,pDest) \
 		zend_hash_index_update_or_next_insert(ht,h,pData,nDataSize,pDest,HASH_UPDATE)
 #define zend_hash_next_index_insert(ht,pData,nDataSize,pDest) \
 		zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT)
+#define zend_hash_next_index_insert_ptr(ht,pData,nDataSize,pDest) \
+		zend_hash_index_update_or_next_insert(ht,0,pData,nDataSize,pDest,HASH_NEXT_INSERT|HASH_ADD_PTR)
 
-typedef struct _zend_hash_key {
-	char *arKey;
-	uint nKeyLength;
-	ulong h;
-} zend_hash_key;
-
-
-typedef int (*apply_func_args_t)(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
-
-#define ZEND_STD_HASH_APPLIER		\
-	int (*)(void *element, int num_args, va_list args, zend_hash_key *hash_key)
-
-ZEND_API void zend_hash_graceful_destroy(HashTable *ht);
-ZEND_API void zend_hash_apply(HashTable *ht, apply_func_t apply_func);
-ZEND_API void zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *);
-ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, ZEND_STD_HASH_APPLIER, int, ...);
+ZEND_API int zend_hash_pointer_update(HashTable *ht, char *arKey, uint nKeyLength, void *pData);
 
+ZEND_API int zend_hash_pointer_index_update_or_next_insert(HashTable *ht, ulong h, void *pData, int flag);
+#define zend_hash_pointer_index_update(ht,h,pData) \
+		zend_hash_pointer_index_update_or_next_insert(ht,h,pData,HASH_UPDATE)
+#define zend_hash_next_index_pointer_insert(ht,pData) \
+        zend_hash_pointer_index_update_or_next_insert(ht,0,pData,HASH_NEXT_INSERT)
+ZEND_API void zend_hash_apply(HashTable *ht,int (*destruct) (void *));
+ZEND_API void zend_hash_apply_with_argument(HashTable *ht,int (*destruct) (void *, void *), void *);
 
 
 
@@ -141,59 +121,33 @@ ZEND_API int zend_hash_index_find(HashTable *ht, ulong h, void **pData);
 /* Misc */
 ZEND_API int zend_hash_exists(HashTable *ht, char *arKey, uint nKeyLength);
 ZEND_API int zend_hash_index_exists(HashTable *ht, ulong h);
+ZEND_API int zend_hash_is_pointer(HashTable *ht, char *arKey, uint nKeyLength);
+ZEND_API int zend_hash_index_is_pointer(HashTable *ht, ulong h);
 ZEND_API ulong zend_hash_next_free_element(HashTable *ht);
 
 /* traversing */
-ZEND_API int zend_hash_move_forward_ex(HashTable *ht, HashPosition *pos);
-ZEND_API int zend_hash_move_backwards_ex(HashTable *ht, HashPosition *pos);
-ZEND_API int zend_hash_get_current_key_ex(HashTable *ht, char **str_index, ulong *str_length, ulong *num_index, zend_bool duplicate, HashPosition *pos);
-ZEND_API int zend_hash_get_current_key_type_ex(HashTable *ht, HashPosition *pos);
-ZEND_API int zend_hash_get_current_data_ex(HashTable *ht, void **pData, HashPosition *pos);
-ZEND_API void zend_hash_internal_pointer_reset_ex(HashTable *ht, HashPosition *pos);
-ZEND_API void zend_hash_internal_pointer_end_ex(HashTable *ht, HashPosition *pos);
-
-#define zend_hash_move_forward(ht) \
-	zend_hash_move_forward_ex(ht, NULL)
-#define zend_hash_move_backwards(ht) \
-	zend_hash_move_backwards_ex(ht, NULL)
-#define zend_hash_get_current_key(ht, str_index, num_index, duplicate) \
-	zend_hash_get_current_key_ex(ht, str_index, NULL, num_index, duplicate, NULL)
-#define zend_hash_get_current_key_type(ht) \
-	zend_hash_get_current_key_type_ex(ht, NULL)
-#define zend_hash_get_current_data(ht, pData) \
-	zend_hash_get_current_data_ex(ht, pData, NULL)
-#define zend_hash_internal_pointer_reset(ht) \
-	zend_hash_internal_pointer_reset_ex(ht, NULL)
-#define zend_hash_internal_pointer_end(ht) \
-	zend_hash_internal_pointer_end_ex(ht, NULL)
+ZEND_API void zend_hash_move_forward(HashTable *ht);
+ZEND_API void zend_hash_move_backwards(HashTable *ht);
+ZEND_API int zend_hash_get_current_key(HashTable *ht, char **str_index, ulong *num_index);
+ZEND_API int zend_hash_get_current_data(HashTable *ht, void **pData);
+ZEND_API void zend_hash_internal_pointer_reset(HashTable *ht);
+ZEND_API void zend_hash_internal_pointer_end(HashTable *ht);
 
 /* Copying, merging and sorting */
-ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size);
-ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite);
-ZEND_API void zend_hash_merge_ex(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, uint size, zend_bool (*pReplaceOrig)(void *orig, void *p_new));
-ZEND_API int zend_hash_sort(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
-ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered);
-ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar)(const void *, const void *), int flag, void **pData);
+ZEND_API void zend_hash_copy(HashTable *target, HashTable *source, void (*pCopyConstructor) (void *pData), void *tmp, uint size);
+ZEND_API void zend_hash_merge(HashTable *target, HashTable *source, void (*pCopyConstructor) (void *pData), void *tmp, uint size);
+ZEND_API int zend_hash_sort(HashTable *ht, int (*compar) (const void *, const void *), int renumber);
+ZEND_API int zend_hash_minmax(HashTable *ht, int (*compar) (const void *, const void *), int flag, void **pData);
 
 ZEND_API int zend_hash_num_elements(HashTable *ht);
 
-ZEND_API int zend_hash_rehash(HashTable *ht);
 
 ZEND_API ulong hashpjw(char *arKey, uint nKeyLength);
 
-#if ZEND_DEBUG
+#if DEBUG
 /* debug */
 void zend_hash_display_pListTail(HashTable *ht);
 void zend_hash_display(HashTable *ht);
 #endif
 
-END_EXTERN_C()
-
-#define ZEND_INIT_SYMTABLE(ht)								\
-	ZEND_INIT_SYMTABLE_EX(ht, 2, 0)
-
-#define ZEND_INIT_SYMTABLE_EX(ht, n, persistent)			\
-	zend_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
-
-
-#endif							/* ZEND_HASH_H */
+#endif							/* _HASH_ */

Zend/zend_highlight.c

@@ -2,38 +2,29 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
 #include "zend.h"
-#include "zend_language_parser.h"
 #include "zend_compile.h"
 #include "zend_highlight.h"
 #include "zend_ptr_stack.h"
 #include "zend_globals.h"
 
-#ifndef ZTS
 extern char *zendtext;
 extern int zendleng;
-#else
-#define zendtext ((char *) zend_get_zendtext(CLS_C))
-#define zendleng zend_get_zendleng(CLS_C)
-#endif
 
-ZEND_API void zend_html_putc(char c)
+
+static void html_putc(char c)
 {
 	switch (c) {
 		case '\n':
@@ -61,18 +52,19 @@ ZEND_API void zend_html_putc(char c)
 }
 
 
-ZEND_API void zend_html_puts(char *s, uint len)
+static void html_puts(char *s, uint len)
 {
 	register char *ptr=s, *end=s+len;
 	
 	while (ptr<end) {
-		zend_html_putc(*ptr++);
+		html_putc(*ptr++);
 	}
 }
 
 
 
-ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini)
+
+void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini)
 {
 	zval token;
 	int token_type;
@@ -81,26 +73,24 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 	int in_string=0;
 	CLS_FETCH();
 
-	zend_printf("<code>");
 	zend_printf("<font color=\"%s\">\n", last_color);
 	/* highlight stuff coming back from zendlex() */
 	token.type = 0;
 	while ((token_type=lex_scan(&token CLS_CC))) {
 		switch (token_type) {
-			case T_INLINE_HTML:
+			case INLINE_HTML:
 				next_color = syntax_highlighter_ini->highlight_html;
 				break;
-			case T_COMMENT:
+			case ZEND_COMMENT:
 				next_color = syntax_highlighter_ini->highlight_comment;
 				break;
-			case T_OPEN_TAG:
-			case T_OPEN_TAG_WITH_ECHO:
+			case PHP_OPEN_TAG:
 				next_color = syntax_highlighter_ini->highlight_default;
 				break;
-			case T_CLOSE_TAG:
+			case PHP_CLOSE_TAG:
 				next_color = syntax_highlighter_ini->highlight_default;
 				break;
-			case T_CONSTANT_ENCAPSED_STRING:
+			case CONSTANT_ENCAPSED_STRING:
 				next_color = syntax_highlighter_ini->highlight_string;
 				break;
 			case '"':
@@ -108,7 +98,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 				in_string = !in_string;
 				break;				
 			case T_WHITESPACE:
-				zend_html_puts(zendtext, zendleng);  /* no color needed */
+				html_puts(zendtext, zendleng);  /* no color needed */
 				token.type = 0;
 				continue;
 				break;
@@ -135,33 +125,23 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 			}
 		}
 		switch (token_type) {
-			case T_END_HEREDOC:
-				zend_html_puts(token.value.str.val, token.value.str.len);
+			case DOLLAR_OPEN_CURLY_BRACES:
+				html_puts("{", 1);
 				break;
 			default:
-				zend_html_puts(zendtext, zendleng);
+				html_puts(zendtext, zendleng);
 				break;
 		}
 
 		if (token.type == IS_STRING) {
 			switch (token_type) {
-				case T_OPEN_TAG:
-				case T_OPEN_TAG_WITH_ECHO:
-				case T_CLOSE_TAG:
-				case T_WHITESPACE:
-				case T_COMMENT:
-					break;
-				default:
-					efree(token.value.str.val);
-					break;
-			}
-		} else if (token_type == T_END_HEREDOC) {
-			zend_bool has_semicolon=(strchr(token.value.str.val, ';')?1:0);
-
-			efree(token.value.str.val);
-			if (has_semicolon) {
-				/* the following semicolon was unput(), ignore it */
-				lex_scan(&token CLS_CC);
+			case PHP_OPEN_TAG:
+			case PHP_CLOSE_TAG:
+			case T_WHITESPACE:
+				break;
+			default:
+				efree(token.value.str.val);
+				break;
 			}
 		}
 		token.type = 0;
@@ -170,7 +150,6 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 		zend_printf("</font>\n");
 	}
 	zend_printf("</font>\n");
-	zend_printf("</code>");
 }
 
 /*

Zend/zend_highlight.h

@@ -2,24 +2,20 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
-#ifndef ZEND_HIGHLIGHT_H
-#define ZEND_HIGHLIGHT_H
+#ifndef _HIGHLIGHT_H
+#define _HIGHLIGHT_H
 
 #define HL_COMMENT_COLOR     "#FF8000"    /* orange */
 #define HL_DEFAULT_COLOR     "#0000BB"    /* blue */
@@ -29,7 +25,7 @@
 #define HL_KEYWORD_COLOR     "#007700"    /* green */
 
 
-typedef struct _zend_syntax_highlighter_ini {
+typedef struct {
 	char *highlight_html;
 	char *highlight_comment;
 	char *highlight_default;
@@ -37,14 +33,10 @@ typedef struct _zend_syntax_highlighter_ini {
 	char *highlight_keyword;
 } zend_syntax_highlighter_ini;
 
+void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini);
 
-BEGIN_EXTERN_C()
-ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini);
-ZEND_API int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
-ZEND_API int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini, char *str_name);
-ZEND_API void zend_html_putc(char c);
-ZEND_API void zend_html_puts(char *s, uint len);
-END_EXTERN_C()
+int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlighter_ini);
+int highlight_string(zval *str, zend_syntax_highlighter_ini *syntax_highlighter_ini);
 
 extern zend_syntax_highlighter_ini syntax_highlighter_ini;
 

Zend/zend_indent.c

@@ -2,38 +2,27 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
-
 /* This indenter doesn't really work, it's here for no particular reason. */
 
 
 #include "zend.h"
-#include "zend_language_parser.h"
 #include "zend_compile.h"
 #include "zend_indent.h"
 
-#ifndef ZTS
 extern char *zendtext;
 extern int zendleng;
-#else
-#define zendtext ((char *) zend_get_zendtext(CLS_C))
-#define zendleng zend_get_zendleng(CLS_C)
-#endif
-
 
 static void handle_whitespace(int *emit_whitespace)
 {
@@ -43,7 +32,7 @@ static void handle_whitespace(int *emit_whitespace)
 	for (c=0; c<128; c++) {
 		if (emit_whitespace[c]>0) {
 			for (i=0; i<emit_whitespace[c]; i++) {
-				zend_write((char *) &c, 1);
+				zend_write(&c, 1);
 			}
 		}
 	}
@@ -51,7 +40,7 @@ static void handle_whitespace(int *emit_whitespace)
 }
 
 
-ZEND_API void zend_indent()
+void zend_indent()
 {
 	zval token;
 	int token_type;
@@ -67,7 +56,7 @@ ZEND_API void zend_indent()
 	token.type = 0;
 	while ((token_type=lex_scan(&token CLS_CC))) {
 		switch (token_type) {
-			case T_INLINE_HTML:
+			case INLINE_HTML:
 				zend_write(zendtext, zendleng);
 				break;
 			case T_WHITESPACE: {
@@ -138,8 +127,8 @@ dflt_printout:
 		}
 		if (token.type == IS_STRING) {
 			switch (token_type) {
-			case T_OPEN_TAG:
-			case T_CLOSE_TAG:
+			case PHP_OPEN_TAG:
+			case PHP_CLOSE_TAG:
 			case T_WHITESPACE:
 				break;
 			default:

Zend/zend_indent.h

@@ -2,25 +2,21 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998, 1999 Andi Gutmans, Zeev Suraski                  |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        | 
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
+   | This source file is subject to the Zend license, that is bundled     |
+   | with this package in the file LICENSE.  If you did not receive a     |
+   | copy of the Zend license, please mail us at zend@zend.com so we can  |
+   | send you a copy immediately.                                         |
    +----------------------------------------------------------------------+
    | Authors: Andi Gutmans <andi@zend.com>                                |
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
+#ifndef _ZEND_INDENT_H
+#define _ZEND_INDENT_H
 
-#ifndef ZEND_INDENT_H
-#define ZEND_INDENT_H
+void zend_indent();
 
-ZEND_API void zend_indent(void);
-
-#endif /* ZEND_INDENT_H */
+#endif /* _ZEND_INDENT_H */

Zend/zend_ini.c

@@ -1,499 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Author: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
-*/
-
-
-#include <stdlib.h>
-
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_ini.h"
-#include "zend_alloc.h"
-#include "zend_operators.h"
-
-static HashTable *registered_zend_ini_directives; 
-
-
-/*
- * hash_apply functions
- */
-static int zend_remove_ini_entries(zend_ini_entry *ini_entry, int *module_number)
-{
-	if (ini_entry->module_number == *module_number) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-
-static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage)
-{
-	if (ini_entry->modified) {
-		if (ini_entry->on_modify) {
-			ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage);
-		}
-		efree(ini_entry->value);
-		ini_entry->value = ini_entry->orig_value;
-		ini_entry->value_length = ini_entry->orig_value_length;
-		ini_entry->modified = 0;
-		ini_entry->orig_value = NULL;
-		ini_entry->orig_value_length = 0;
-	}
-	return 0;
-}
-
-/*
- * Startup / shutdown
- */
-ZEND_API int zend_ini_startup(ELS_D)
-{
-	registered_zend_ini_directives = &EG(ini_directives);
-	if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0)==FAILURE) {
-		return FAILURE;
-	}
-	return SUCCESS;
-}
-
-
-ZEND_API int zend_ini_shutdown(ELS_D)
-{
-	zend_hash_destroy(&EG(ini_directives));
-	return SUCCESS;
-}
-
-
-ZEND_API int zend_ini_deactivate(ELS_D)
-{
-	zend_hash_apply_with_argument(&EG(ini_directives), (int (*)(void *, void *)) zend_restore_ini_entry_cb, (void *) ZEND_INI_STAGE_DEACTIVATE);
-	return SUCCESS;
-}
-
-
-ZEND_API int zend_copy_ini_directives(ELS_D)
-{
-	zend_ini_entry ini_entry;
-
-	if (zend_hash_init_ex(&EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0)==FAILURE) {
-		return FAILURE;
-	}
-	zend_hash_copy(&EG(ini_directives), registered_zend_ini_directives, NULL, &ini_entry, sizeof(zend_ini_entry));
-	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP ELS_CC);
-	return SUCCESS;
-}
-
-
-static int ini_key_compare(const void *a, const void *b)
-{
-	Bucket *f;
-	Bucket *s;
- 
-	f = *((Bucket **) a);
-	s = *((Bucket **) b);
-
-	if (f->nKeyLength==0 && s->nKeyLength==0) { /* both numeric */
-		return ZEND_NORMALIZE_BOOL(f->nKeyLength - s->nKeyLength);
-	} else if (f->nKeyLength==0) { /* f is numeric, s is not */
-		return -1;
-	} else if (s->nKeyLength==0) { /* s is numeric, f is not */
-		return 1;
-	} else { /* both strings */
-		return zend_binary_strcasecmp(f->arKey, f->nKeyLength, s->arKey, s->nKeyLength);
-	}
-}
-
-
-ZEND_API void zend_ini_sort_entries(ELS_D)
-{
-	zend_hash_sort(&EG(ini_directives), qsort, ini_key_compare, 0);
-}
-
-/*
- * Registration / unregistration
- */
-
-ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number)
-{
-	zend_ini_entry *p = ini_entry;
-	zend_ini_entry *hashed_ini_entry;
-	zval default_value;
-
-	while (p->name) {
-		p->module_number = module_number;
-		if (zend_hash_add(registered_zend_ini_directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) {
-			zend_unregister_ini_entries(module_number);
-			return FAILURE;
-		}
-		if ((zend_get_configuration_directive(p->name, p->name_length, &default_value))==SUCCESS) {
-			if (!hashed_ini_entry->on_modify
-				|| hashed_ini_entry->on_modify(hashed_ini_entry, default_value.value.str.val, default_value.value.str.len, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP)==SUCCESS) {
-				hashed_ini_entry->value = default_value.value.str.val;
-				hashed_ini_entry->value_length = default_value.value.str.len;
-			}
-		} else {
-			if (hashed_ini_entry->on_modify) {
-				hashed_ini_entry->on_modify(hashed_ini_entry, hashed_ini_entry->value, hashed_ini_entry->value_length, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP);
-			}
-		}
-		p++;
-	}
-	return SUCCESS;
-}
-
-
-ZEND_API void zend_unregister_ini_entries(int module_number)
-{
-	zend_hash_apply_with_argument(registered_zend_ini_directives, (int (*)(void *, void *)) zend_remove_ini_entries, (void *) &module_number);
-}
-
-
-static int zend_ini_refresh_cache(zend_ini_entry *p, int stage)
-{
-	if (p->on_modify) {
-		p->on_modify(p, p->value, p->value_length, p->mh_arg1, p->mh_arg2, p->mh_arg3, stage);
-	}
-	return 0;
-}
-
-
-ZEND_API void zend_ini_refresh_caches(int stage ELS_DC)
-{
-	zend_hash_apply_with_argument(&EG(ini_directives), (int (*)(void *, void *)) zend_ini_refresh_cache, (void *)(long) stage);
-}
-
-
-ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage)
-{
-	zend_ini_entry *ini_entry;
-	char *duplicate;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
-		return FAILURE;
-	}
-
-	if (!(ini_entry->modifyable & modify_type)) {
-		return FAILURE;
-	}
-
-	duplicate = estrndup(new_value, new_value_length);
-	
-	if (!ini_entry->on_modify
-		|| ini_entry->on_modify(ini_entry, duplicate, new_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage)==SUCCESS) {
-		if (!ini_entry->modified) {
-			ini_entry->orig_value = ini_entry->value;
-			ini_entry->orig_value_length = ini_entry->value_length;
-		} else { /* we already changed the value, free the changed value */
-			efree(ini_entry->value);
-		}
-		ini_entry->value = duplicate;
-		ini_entry->value_length = new_value_length;
-		ini_entry->modified = 1;
-	} else {
-		efree(duplicate);
-	}
-
-	return SUCCESS;
-}
-
-
-ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage)
-{
-	zend_ini_entry *ini_entry;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
-		return FAILURE;
-	}
-
-	zend_restore_ini_entry_cb(ini_entry, stage);
-	return SUCCESS;
-}
-
-
-ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*displayer)(zend_ini_entry *ini_entry, int type))
-{
-	zend_ini_entry *ini_entry;
-
-	if (zend_hash_find(registered_zend_ini_directives, name, name_length, (void **) &ini_entry)==FAILURE) {
-		return FAILURE;
-	}
-
-	ini_entry->displayer = displayer;
-	return SUCCESS;
-}
-
-
-
-/*
- * Data retrieval
- */
-
-ZEND_API long zend_ini_long(char *name, uint name_length, int orig)
-{
-	zend_ini_entry *ini_entry;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
-		if (orig && ini_entry->modified) {
-			return (ini_entry->orig_value ? strtol(ini_entry->orig_value, NULL, 0) : 0);
-		} else if (ini_entry->value) {
-			return strtol(ini_entry->value, NULL, 0);
-		}
-	}
-
-	return 0;
-}
-
-
-ZEND_API double zend_ini_double(char *name, uint name_length, int orig)
-{
-	zend_ini_entry *ini_entry;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
-		if (orig && ini_entry->modified) {
-			return (double) (ini_entry->orig_value ? strtod(ini_entry->orig_value, NULL) : 0.0);
-		} else if (ini_entry->value) {
-			return (double) strtod(ini_entry->value, NULL);
-		}
-	}
-
-	return 0.0;
-}
-
-
-ZEND_API char *zend_ini_string(char *name, uint name_length, int orig)
-{
-	zend_ini_entry *ini_entry;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
-		if (orig && ini_entry->modified) {
-			return ini_entry->orig_value;
-		} else {
-			return ini_entry->value;
-		}
-	}
-
-	return "";
-}
-
-
-zend_ini_entry *get_ini_entry(char *name, uint name_length)
-{
-	zend_ini_entry *ini_entry;
-	ELS_FETCH();
-
-	if (zend_hash_find(&EG(ini_directives), name, name_length, (void **) &ini_entry)==SUCCESS) {
-		return ini_entry;
-	} else {
-		return NULL;
-	}
-}
-
-
-static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
-{
-	if (ini_entry->displayer) {
-		ini_entry->displayer(ini_entry, type);
-	} else {
-		char *display_string;
-		uint display_string_length;
-
-		if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
-			if (ini_entry->orig_value) {
-				display_string = ini_entry->orig_value;
-				display_string_length = ini_entry->orig_value_length;
-			} else {
-				display_string = "<i>no value</i>";
-				display_string_length = sizeof("<i>no value</i>")-1;
-			}
-		} else if (ini_entry->value && ini_entry->value[0]) {
-			display_string = ini_entry->value;
-			display_string_length = ini_entry->value_length;
-		} else {
-			display_string = "<i>no value</i>";
-			display_string_length = sizeof("<i>no value</i>")-1;
-		}
-		ZEND_WRITE(display_string, display_string_length);
-	}
-}
-
-
-ZEND_INI_DISP(zend_ini_boolean_displayer_cb)
-{
-	int value;
-
-	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
-		value = (ini_entry->orig_value ? atoi(ini_entry->orig_value) : 0);
-	} else if (ini_entry->value) {
-		value = atoi(ini_entry->value);
-	} else {
-		value = 0;
-	}
-	if (value) {
-		ZEND_PUTS("On");
-	} else {
-		ZEND_PUTS("Off");
-	}
-}
-
-
-ZEND_INI_DISP(zend_ini_color_displayer_cb)
-{
-	char *value;
-
-	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
-		value = ini_entry->orig_value;
-	} else if (ini_entry->value) {
-		value = ini_entry->value;
-	} else {
-		value = NULL;
-	}
-	if (value) {
-		zend_printf("<font color=\"%s\">%s</font>", value, value);
-	} else {
-		ZEND_PUTS("<i>no value</i>;");
-	}
-}
-
-
-ZEND_INI_DISP(display_link_numbers)
-{
-	char *value;
-
-	if (type==ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
-		value = ini_entry->orig_value;
-	} else if (ini_entry->value) {
-		value = ini_entry->value;
-	} else {
-		value = NULL;
-	}
-
-	if (value) {
-		if (atoi(value)==-1) {
-			ZEND_PUTS("Unlimited");
-		} else {
-			zend_printf("%s", value);
-		}
-	}
-}
-
-
-/* Standard message handlers */
-
-ZEND_API ZEND_INI_MH(OnUpdateBool)
-{
-	zend_bool *p;
-#ifndef ZTS
-	char *base = (char *) mh_arg2;
-#else
-	char *base;
-
-	base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
-	p = (zend_bool *) (base+(size_t) mh_arg1);
-
-	*p = (zend_bool) atoi(new_value);
-	return SUCCESS;
-}
-
-
-ZEND_API ZEND_INI_MH(OnUpdateInt)
-{
-	long *p;
-#ifndef ZTS
-	char *base = (char *) mh_arg2;
-#else
-	char *base;
-
-	base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
-	p = (long *) (base+(size_t) mh_arg1);
-
-	*p = zend_atoi(new_value, new_value_length);
-	return SUCCESS;
-}
-
-
-ZEND_API ZEND_INI_MH(OnUpdateReal)
-{
-	double *p;
-#ifndef ZTS
-	char *base = (char *) mh_arg2;
-#else
-	char *base;
-
-	base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
-	p = (double *) (base+(size_t) mh_arg1);
-
-	*p = strtod(new_value, NULL);
-	return SUCCESS;
-}
-
-
-ZEND_API ZEND_INI_MH(OnUpdateString)
-{
-	char **p;
-#ifndef ZTS
-	char *base = (char *) mh_arg2;
-#else
-	char *base;
-
-	base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
-	p = (char **) (base+(size_t) mh_arg1);
-
-	*p = new_value;
-	return SUCCESS;
-}
-
-
-ZEND_API ZEND_INI_MH(OnUpdateStringUnempty)
-{
-	char **p;
-#ifndef ZTS
-	char *base = (char *) mh_arg2;
-#else
-	char *base;
-
-	base = (char *) ts_resource(*((int *) mh_arg2));
-#endif
-
-	if (new_value && !new_value[0]) {
-		return FAILURE;
-	}
-
-	p = (char **) (base+(size_t) mh_arg1);
-
-	*p = new_value;
-	return SUCCESS;
-}
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

Zend/zend_ini.h

@@ -1,195 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Author: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
-*/
-
-
-#ifndef ZEND_INI_H
-#define ZEND_INI_H
-
-#define ZEND_INI_USER	(1<<0)
-#define ZEND_INI_PERDIR	(1<<1)
-#define ZEND_INI_SYSTEM	(1<<2)
-
-#define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
-
-#ifndef XtOffsetOf
-# if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-# ifdef __STDC__
-# define XtOffset(p_type,field) _Offsetof(p_type,field)
-# else
-# ifdef CRAY2
-# define XtOffset(p_type,field) \
-    (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
-
-# else /* !CRAY2 */
-
-# define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
-
-# endif /* !CRAY2 */
-# endif /* __STDC__ */
-# else /* ! (CRAY || __arm) */
-
-# define XtOffset(p_type,field) \
-    ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-
-# endif /* !CRAY */
-
-# ifdef offsetof
-# define XtOffsetOf(s_type,field) offsetof(s_type,field)
-# else
-# define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
-# endif
-
-#endif
-
-typedef struct _zend_ini_entry zend_ini_entry;
-
-#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, char *new_value, uint new_value_length, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
-#define ZEND_INI_DISP(name) void name(zend_ini_entry *ini_entry, int type)
-
-struct _zend_ini_entry {
-	int module_number;
-	int modifyable;
-	char *name;
-	uint name_length;
-	ZEND_INI_MH((*on_modify));
-	void *mh_arg1;
-	void *mh_arg2;
-	void *mh_arg3;
-
-	char *value;
-	uint value_length;
-
-	char *orig_value;
-	uint orig_value_length;
-	int modified;
-
-	void (*displayer)(zend_ini_entry *ini_entry, int type);
-};
-
-
-ZEND_API int zend_ini_startup(ELS_D);
-ZEND_API int zend_ini_shutdown(ELS_D);
-ZEND_API int zend_ini_deactivate(ELS_D);
-
-ZEND_API int zend_copy_ini_directives(ELS_D);
-
-ZEND_API void zend_ini_sort_entries(ELS_D);
-
-ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_number);
-ZEND_API void zend_unregister_ini_entries(int module_number);
-ZEND_API void zend_ini_refresh_caches(int stage ELS_DC);
-ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage);
-ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage);
-ZEND_API void display_ini_entries(zend_module_entry *module);
-
-ZEND_API long zend_ini_long(char *name, uint name_length, int orig);
-ZEND_API double zend_ini_double(char *name, uint name_length, int orig);
-ZEND_API char *zend_ini_string(char *name, uint name_length, int orig);
-zend_ini_entry *get_ini_entry(char *name, uint name_length);
-
-ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
-
-ZEND_API ZEND_INI_DISP(zend_ini_boolean_displayer_cb);
-ZEND_API ZEND_INI_DISP(zend_ini_color_displayer_cb);
-ZEND_API ZEND_INI_DISP(display_link_numbers);
-
-#define ZEND_INI_BEGIN()		static zend_ini_entry ini_entries[] = {
-#define ZEND_INI_END()		{ 0, 0, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0, NULL, 0, 0, NULL } };
-
-#define ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, displayer) \
-	{ 0, modifyable, name, sizeof(name), on_modify, arg1, arg2, arg3, default_value, sizeof(default_value)-1, NULL, 0, 0, displayer },
-
-#define ZEND_INI_ENTRY3(name, default_value, modifyable, on_modify, arg1, arg2, arg3) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, arg3, NULL)
-
-#define ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, displayer) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL, displayer)
-
-#define ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, arg1, arg2) \
-	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, arg1, arg2, NULL)
-
-#define ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, displayer) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, arg1, NULL, NULL, displayer)
-
-#define ZEND_INI_ENTRY1(name, default_value, modifyable, on_modify, arg1) \
-	ZEND_INI_ENTRY1_EX(name, default_value, modifyable, on_modify, arg1, NULL)
-	
-#define ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, displayer) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, NULL, NULL, NULL, displayer)
-
-#define ZEND_INI_ENTRY(name, default_value, modifyable, on_modify) \
-	ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, NULL)
-
-#ifdef ZTS
-#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-	ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id)
-#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
-	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, displayer)
-#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr##_id, NULL, zend_ini_boolean_displayer_cb)
-#else
-#define STD_ZEND_INI_ENTRY(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-	ZEND_INI_ENTRY2(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr)
-#define STD_ZEND_INI_ENTRY_EX(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr, displayer) \
-	ZEND_INI_ENTRY2_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, displayer)
-#define STD_ZEND_INI_BOOLEAN(name, default_value, modifyable, on_modify, property_name, struct_type, struct_ptr) \
-	ZEND_INI_ENTRY3_EX(name, default_value, modifyable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
-#endif
-
-#define INI_INT(name) zend_ini_long((name), sizeof(name), 0)
-#define INI_FLT(name) zend_ini_double((name), sizeof(name), 0)
-#define INI_STR(name) zend_ini_string((name), sizeof(name), 0)
-#define INI_BOOL(name) ((zend_bool) INI_INT(name))
-
-#define INI_ORIG_INT(name)	zend_ini_long((name), sizeof(name), 1)
-#define INI_ORIG_FLT(name)	zend_ini_double((name), sizeof(name), 1)
-#define INI_ORIG_STR(name)	zend_ini_string((name), sizeof(name), 1)
-#define INI_ORIG_BOOL(name) ((zend_bool) INI_ORIG_INT(name))
-
-
-#define REGISTER_INI_ENTRIES() zend_register_ini_entries(ini_entries, module_number)
-#define UNREGISTER_INI_ENTRIES() zend_unregister_ini_entries(module_number)
-#define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module)
-
-#define REGISTER_INI_DISPLAYER(name, displayer) zend_ini_register_displayer((name), sizeof(name), displayer)
-#define REGISTER_INI_BOOLEAN(name) REGISTER_INI_DISPLAYER(name, zend_ini_boolean_displayer_cb)
-
-/* Standard message handlers */
-ZEND_API ZEND_INI_MH(OnUpdateBool);
-ZEND_API ZEND_INI_MH(OnUpdateInt);
-ZEND_API ZEND_INI_MH(OnUpdateReal);
-ZEND_API ZEND_INI_MH(OnUpdateString);
-ZEND_API ZEND_INI_MH(OnUpdateStringUnempty);
-
-
-#define ZEND_INI_DISPLAY_ORIG	1
-#define ZEND_INI_DISPLAY_ACTIVE	2
-
-#define ZEND_INI_STAGE_STARTUP		(1<<0)
-#define ZEND_INI_STAGE_SHUTDOWN		(1<<1)
-#define ZEND_INI_STAGE_ACTIVATE		(1<<2)
-#define ZEND_INI_STAGE_DEACTIVATE	(1<<3)
-#define ZEND_INI_STAGE_RUNTIME		(1<<4)
-
-/* INI parsing engine */
-typedef void (*zend_ini_parser_cb_t)(zval *arg1, zval *arg2, int callback_type, void *arg);
-int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg);
-#define ZEND_INI_PARSER_ENTRY	1
-#define ZEND_INI_PARSER_SECTION	2
-
-#endif /* ZEND_INI_H */

Zend/zend_ini_parser.y

@@ -1,231 +0,0 @@
-%{
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2001 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 0.92 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.zend.com/license/0_92.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Author: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
-*/
-
-
-/* $Id$ */
-
-#define DEBUG_CFG_PARSER 0
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_ini.h"
-#include "zend_constants.h"
-#include "zend_ini_scanner.h"
-#include "zend_extensions.h"
-
-
-#if WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winbase.h>
-#endif
-
-
-typedef struct _zend_ini_parser_param {
-	zend_ini_parser_cb_t ini_parser_cb;
-	void *arg;
-} zend_ini_parser_param;
-
-#define YYSTYPE zval
-#define YYPARSE_PARAM ini_parser_param
-
-#define ZEND_INI_PARSER_CB	((zend_ini_parser_param *) ini_parser_param)->ini_parser_cb
-#define ZEND_INI_PARSER_ARG	((zend_ini_parser_param *) ini_parser_param)->arg
-
-int ini_lex(zval *ini_lval);
-int ini_parse(void *ini_parser_param);
-
-zval yylval;
-
-#ifndef ZTS
-extern int ini_lex(zval *ini_lval);
-extern FILE *ini_in;
-extern int ini_lineno;
-extern void init_cfg_scanner(void);
-#endif
-
-void zend_ini_do_op(char type, zval *result, zval *op1, zval *op2)
-{
-	int i_result;
-	int i_op1, i_op2;
-	char str_result[MAX_LENGTH_OF_LONG];
-
-	i_op1 = atoi(op1->value.str.val);
-	free(op1->value.str.val);
-	if (op2) {
-		i_op2 = atoi(op2->value.str.val);
-		free(op2->value.str.val);
-	} else {
-		i_op2 = 0;
-	}
-
-	switch (type) {
-		case '|':
-			i_result = i_op1 | i_op2;
-			break;
-		case '&':
-			i_result = i_op1 & i_op2;
-			break;
-		case '~':
-			i_result = ~i_op1;
-			break;
-		case '!':
-			i_result = !i_op1;
-			break;
-		default:
-			i_result = 0;
-			break;
-	}
-
-	result->value.str.len = zend_sprintf(str_result, "%d", i_result);
-	result->value.str.val = (char *) malloc(result->value.str.len+1);
-	memcpy(result->value.str.val, str_result, result->value.str.len);
-	result->value.str.val[result->value.str.len] = 0;
-	result->type = IS_STRING;
-}
-
-
-void zend_ini_get_constant(zval *result, zval *name)
-{
-	zval z_constant;
-
-	if (zend_get_constant(name->value.str.val, name->value.str.len, &z_constant)) {
-		/* z_constant is emalloc()'d */
-		convert_to_string(&z_constant);
-		result->value.str.val = zend_strndup(z_constant.value.str.val, z_constant.value.str.len);
-		result->value.str.len = z_constant.value.str.len;
-		result->type = z_constant.type;
-		zval_dtor(&z_constant);
-		free(name->value.str.val);	
-	} else {
-		*result = *name;
-	}
-}
-
-
-static void ini_error(char *str)
-{
-	char *error_buf;
-	int error_buf_len;
-	char *currently_parsed_filename = zend_ini_scanner_get_filename();
-	CLS_FETCH();
-
-	error_buf_len = 128+strlen(currently_parsed_filename); /* should be more than enough */
-	error_buf = (char *) emalloc(error_buf_len);
-
-	sprintf(error_buf, "Error parsing %s on line %d\n", currently_parsed_filename, zend_ini_scanner_get_lineno());
-
-	if (CG(ini_parser_unbuffered_errors)) {
-#ifdef PHP_WIN32
-		MessageBox(NULL, error_buf, "PHP Error", MB_OK|MB_TOPMOST|0x00200000L);
-#else
-		fprintf(stderr, "PHP:  %s", error_buf);
-#endif
-	} else {
-		zend_error(E_CORE_WARNING, error_buf);
-	}
-	efree(error_buf);
-}
-
-
-int zend_parse_ini_file(zend_file_handle *fh, zend_bool unbuffered_errors, zend_ini_parser_cb_t ini_parser_cb, void *arg)
-{
-	zend_ini_parser_param ini_parser_param;
-	int retval;
-	CLS_FETCH();
-
-	ini_parser_param.ini_parser_cb = ini_parser_cb;
-	ini_parser_param.arg = arg;
-
-	if (zend_ini_open_file_for_scanning(fh)==FAILURE) {
-		return FAILURE;
-	}
-
-	CG(ini_parser_unbuffered_errors) = unbuffered_errors;
-	retval = ini_parse(&ini_parser_param);
-
-	zend_ini_close_file(fh);
-
-	if (retval==0) {
-		return SUCCESS;
-	} else {
-		return FAILURE;
-	}
-}
-
-
-%}
-
-%pure_parser
-%token TC_STRING
-%token TC_ENCAPSULATED_STRING
-%token SECTION
-%token CFG_TRUE
-%token CFG_FALSE
-%left '|' '&'
-%right '~' '!'
-
-%%
-
-statement_list:
-		statement_list statement
-	|	/* empty */
-;
-
-statement:
-		TC_STRING '=' string_or_value {
-#if DEBUG_CFG_PARSER
-			printf("'%s' = '%s'\n", $1.value.str.val, $3.value.str.val);
-#endif
-			ZEND_INI_PARSER_CB(&$1, &$3, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG);
-			free($1.value.str.val);
-			free($3.value.str.val);
-		}
-	|	TC_STRING { ZEND_INI_PARSER_CB(&$1, NULL, ZEND_INI_PARSER_ENTRY, ZEND_INI_PARSER_ARG); free($1.value.str.val); }
-	|	SECTION { ZEND_INI_PARSER_CB(&$1, NULL, ZEND_INI_PARSER_SECTION, ZEND_INI_PARSER_ARG); free($1.value.str.val); }
-	|	'\n'
-;
-
-
-string_or_value:
-		expr { $$ = $1; }
-	|	TC_ENCAPSULATED_STRING { $$ = $1; }
-	|	CFG_TRUE { $$ = $1; }
-	|	CFG_FALSE { $$ = $1; }
-	|	'\n' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
-	|	'\0' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
-;
-
-expr:
-		constant_string			{ $$ = $1; }
-	|	expr '|' expr			{ zend_ini_do_op('|', &$$, &$1, &$3); }
-	|	expr '&' expr			{ zend_ini_do_op('&', &$$, &$1, &$3); }
-	|	'~' expr				{ zend_ini_do_op('~', &$$, &$2, NULL); }
-	|	'!'	expr				{ zend_ini_do_op('!', &$$, &$2, NULL); }
-	|	'(' expr ')'			{ $$ = $2; }
-;
-
-constant_string:
-		TC_STRING { zend_ini_get_constant(&$$, &$1); }
-;
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */