From 0b3ed989f766e586b1fbe5f68538ef3d3f59490b Mon Sep 17 00:00:00 2001 From: cvs2git Date: Wed, 2 Jul 2003 16:19:39 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'unlabeled-1.2.4'. Sprout from master 2003-07-02 16:19:39 UTC ggodlewski '- should be good now' Delete: FAQ.php php-4.1.2-dom-xslt-patch php-ZVAL.patch php-ac250.patch php-acam.patch php-allow-db31.patch php-am_ac_lt.patch php-apache.ini php-apache2.patch php-build_modules.patch php-cgi.ini php-cli.ini php-cpdf-fix.patch php-dl-zlib.patch php-domxml_node.patch php-hyperwave-fix.patch php-image_c.patch php-imap.patch php-ini.patch php-java-norpath.patch php-libpq_fs_h_path.patch php-libtool.patch php-libxml2.patch php-link-libs.patch php-mail.patch php-mailsecurity2.patch php-mcal-shared-lib.patch php-mnogosearch-php-extension-1.68.patch php-mod_php.conf php-module-install php-msession-shared-lib.patch php-no-metaccld.patch php-oracle9.patch php-pdflib4.0.2.patch php-pear-install.patch php-pearinstall.patch php-pldlogo.patch php-register_shutdown_function.patch php-sapi-ini-file.patch php-session-unregister.patch php-shared.patch php-threads-acfix.patch php-tsrmlsfetchgcc2.patch php-wddx-fix.patch php-xml-expat-fix.patch php-xml_fix php-xmlrpc-fix.patch php-xslt-gcc33.patch php.spec zend.gif --- FAQ.php | 916 --------- php-4.1.2-dom-xslt-patch | 1802 ---------------- php-ZVAL.patch | 14 - php-ac250.patch | 248 --- php-acam.patch | 10 - php-allow-db31.patch | 18 - php-am_ac_lt.patch | 33 - php-apache.ini | 15 - php-apache2.patch | 310 --- php-build_modules.patch | 9 - php-cgi.ini | 14 - php-cli.ini | 14 - php-cpdf-fix.patch | 55 - php-dl-zlib.patch | 21 - php-domxml_node.patch | 10 - php-hyperwave-fix.patch | 27 - php-image_c.patch | 27 - php-imap.patch | 30 - php-ini.patch | 183 -- php-java-norpath.patch | 42 - php-libpq_fs_h_path.patch | 11 - php-libtool.patch | 21 - php-libxml2.patch | 35 - php-link-libs.patch | 10 - php-mail.patch | 66 - php-mailsecurity2.patch | 53 - php-mcal-shared-lib.patch | 22 - php-mnogosearch-php-extension-1.68.patch | 189 -- php-mod_php.conf | 9 - php-module-install | 64 - php-msession-shared-lib.patch | 29 - php-no-metaccld.patch | 31 - php-oracle9.patch | 23 - php-pdflib4.0.2.patch | 802 -------- php-pear-install.patch | 16 - php-pearinstall.patch | 24 - php-pldlogo.patch | 176 -- php-register_shutdown_function.patch | 19 - php-sapi-ini-file.patch | 39 - php-session-unregister.patch | 69 - php-shared.patch | 74 - php-threads-acfix.patch | 37 - php-tsrmlsfetchgcc2.patch | 11 - php-wddx-fix.patch | 9 - php-xml-expat-fix.patch | 11 - php-xml_fix | 11 - php-xmlrpc-fix.patch | 11 - php-xslt-gcc33.patch | 11 - php.spec | 2370 ---------------------- zend.gif | Bin 4440 -> 0 bytes 50 files changed, 8051 deletions(-) delete mode 100644 FAQ.php delete mode 100644 php-4.1.2-dom-xslt-patch delete mode 100644 php-ZVAL.patch delete mode 100644 php-ac250.patch delete mode 100644 php-acam.patch delete mode 100644 php-allow-db31.patch delete mode 100644 php-am_ac_lt.patch delete mode 100644 php-apache.ini delete mode 100644 php-apache2.patch delete mode 100644 php-build_modules.patch delete mode 100644 php-cgi.ini delete mode 100644 php-cli.ini delete mode 100644 php-cpdf-fix.patch delete mode 100644 php-dl-zlib.patch delete mode 100644 php-domxml_node.patch delete mode 100644 php-hyperwave-fix.patch delete mode 100644 php-image_c.patch delete mode 100644 php-imap.patch delete mode 100644 php-ini.patch delete mode 100644 php-java-norpath.patch delete mode 100644 php-libpq_fs_h_path.patch delete mode 100644 php-libtool.patch delete mode 100644 php-libxml2.patch delete mode 100644 php-link-libs.patch delete mode 100644 php-mail.patch delete mode 100644 php-mailsecurity2.patch delete mode 100644 php-mcal-shared-lib.patch delete mode 100644 php-mnogosearch-php-extension-1.68.patch delete mode 100644 php-mod_php.conf delete mode 100644 php-module-install delete mode 100644 php-msession-shared-lib.patch delete mode 100644 php-no-metaccld.patch delete mode 100644 php-oracle9.patch delete mode 100644 php-pdflib4.0.2.patch delete mode 100644 php-pear-install.patch delete mode 100644 php-pearinstall.patch delete mode 100644 php-pldlogo.patch delete mode 100644 php-register_shutdown_function.patch delete mode 100644 php-sapi-ini-file.patch delete mode 100644 php-session-unregister.patch delete mode 100644 php-shared.patch delete mode 100644 php-threads-acfix.patch delete mode 100644 php-tsrmlsfetchgcc2.patch delete mode 100644 php-wddx-fix.patch delete mode 100644 php-xml-expat-fix.patch delete mode 100644 php-xml_fix delete mode 100644 php-xmlrpc-fix.patch delete mode 100644 php-xslt-gcc33.patch delete mode 100644 php.spec delete mode 100644 zend.gif diff --git a/FAQ.php b/FAQ.php deleted file mode 100644 index e41acdf..0000000 --- a/FAQ.php +++ /dev/null @@ -1,916 +0,0 @@ - - - - - -PHP3: Frequently Asked Questions - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
-
- PHP3 Home Page
-
-
- Downloads
-Documentation
-Getting Help
-PHP News last updated: Jun 10, 1998
-Projects using PHP
-PHP Links
-Mirror sites
-
- 		- - - - - -
- Frequently Asked Questions
- 		- View the source code for this pageSearch the site
- - - - - -
-
- 		- -
- - -

This is a list of Frequently Asked Questions about PHP3 and -their answers. If you have suggestions or additions, send them to -php3@lists.php.net. - -

- -

General Information

- -
-
- What is PHP3? -
-
- From the manual: - -
-

PHP Version 3.0 is an HTML-embedded scripting - language. Much of its syntax is borrowed from C, Java and Perl with a - couple of unique PHP-specific features thrown in. The goal of the language - is to allow web developers to write dynamically generated pages quickly. -

-

-

- -
- What is its relation to PHP/FI? -
-
- PHP3 is the successor to PHP/FI 2.0. -

-

-
- Can I run both PHP/FI 2.0 and PHP3 at the same time? -
-
- Yes, PHP3 was written so as to not interfere with an existing PHP/FI 2 installation. - Instructions for building Apache 1.3.0 with both PHP/FI 2 and PHP3 modules can be - found HERE. -

- -

- What are the differences between PHP3 and PHP/FI 2.0? -
-
- For a complete list of the changes, read the CHANGES file included in the PHP3 - distribution. Some highlights: - -
    -
  • All-new parser. -
  • Persistent database connections. -
  • A native Windows95/NT port. -
  • IMAP, SNMP, and LDAP extensions. -
-

-

- -
- I heard it's possible to access Microsoft SQL Server from PHP3. How? -
-
- On Windows 95/NT machines, you can simply use the included ODBC support - and the correct ODBC driver. - -

On Unix machines, you can use the Sybase-CT driver - to access Microsoft SQL Servers because they are (at - least mostly) protocol-compatible. Sybase has made a free version of the necessary - libraries for Linux systems. For other Unix operating systems, - you need to contact Sybase for the correct libraries (which cost - money). -

-

- -
- Can I access Microsoft Access databases? -
-
- Yes. You already have all the tools you need if you are running - entirely under Windows 95 or NT, where you can use ODBC and Microsoft's - ODBC drivers for Microsoft Access databases. From other platforms, you - would need to have a server running Windows NT (or possibly Windows 95) - which you connected to using ODBC drivers from your other platform and - OpenLink Software's ODBC Agent - software, which runs US$4,000. - -

Some better alternatives are to use an SQL server that has - Windows ODBC drivers and use that to store the data, which you can - then access from Microsoft Access (using ODBC) and PHP3 (using the - built-in drivers), or to use an intermediary file format that Access - and PHP3 both understand, such as flat-files or dBase databases. -

-

- -
- Is there a PHP3 mailing list? -
-
- Of course! To subscribe, send mail to - php3-subscribe@lists.php.net. You don't need to include - anything special in the subject or body of the message. - -

To unsubscribe, send mail to php3-unsubscribe@lists.php.net. -

-

- -
- Help! I can't seem to subscribe to the mailing list! -
-
- Help! I can't seem to unsubscribe from the mailing list! -
-
- If you have problems subscribing to or unsubscribing from the - PHP3 mailng list, it may be because the mailing list software - can't figure out the correct mailing address to use. If - your email address was joeblow@example.com, - you can send your subscription request to - php3-subscribe-joeblow=example.com@lists.php.net, - or your unsubscription request to - php3-unsubscribe-joeblow=example.com@lists.php.net. -

-

- -
- Is there an archive of the mailing list anywhere? -
-
- Yes, it's located at http://www.tryc.on.ca/php3.html. -
-
- -
- -

Obtaining PHP3

- -
-
- Where can I obtain PHP3? -
-
- You can download PHP3 from any of the members of the - PHP3 network of sites. These can be found at http://www.php.net/. - You can also use anonymous CVS to get the absolute latest - version of the source. For more information, go to http://ca.php.net/cvsweb.cgi. -

-

- -
- Are pre-compiled binary versions available? -
-
- Yes, as long as you're looking for binaries for Windows 95 or NT. - They're available in the same place as the source. -

-

- -
- Where can I get libraries needed to compile some of the optional - PHP3 extensions? -
-
- Note: Those marked with * are not thread-safe libraries, and - should not be used with PHP3 as a server module in the multi-threaded - Windows web servers (IIS, Netscape). This does not matter in Unix - environments, yet. - - -

-

- -
- How do I get these libraries to work? -
-
- You will need to follow instructions provided with the library. Some of - these libraries are detected automatically when you run the 'configure' - script of PHP3 (such as the GD library), and others you will have to - enable using '--with-EXTENSION' options to 'configure'. Run 'configure - --help' for a listing of these. -

-

- -
- I got the latest version of the PHP3 source code from the CVS - repository on my Windows 95/NT machine, what do I need to compile it? -
-
- First, you will need Microsoft Visual C++ v5 (v4 may do - it also, but we do it with v5), and you will need to download Bison and - Flex. You will need to put Bison and Flex somewhere in your - path, or add their location to your path. Then run the batch file - 'makeparser' before compiling with MSVC. You also may need to edit - some settings in the project settings. You should be familier enough - with MSVC to know what to do ;). -

-

-
- -
- Where do I find the Browser Capabilities File? -
-
- You can find PHP's own browscap.ini file at http://php.netvision.net.il/browscap/. - There is also another browscap.ini file at http://www.cyscape.com/asp/browscap/. -

-

- -
- -

Installation

- -

To install PHP3, follow the instructions in the INSTALL -file located in the distribution. Windows -95 and NT users should also read the README.WIN32 -file. There are also some helpful hints for Windows users here: - -http://leonard.staff.imaginet.fr/Doc/php/configuration_NT.html. - -

Common Problems

- -
-
- I got the latest version of PHP3 using the anonymous CVS service, - but there's no configure script! -
-
- You have to have the GNU autoconf package installed so you can - generate the configure script from configure.in. Just run - autoconf in the top-level directory after getting - the sources from the CVS server. (Also, unless you run configure - with the --enable-maintainer-mode option, the - configure script will not automatically get rebuilt when the - configure.in file is updated, so you should make sure to do that - manually when you notice configure.in has changed. One symptom - of this is finding things like @VARIABLE@ in your Makefile after - configure or config.status is run. -

-

-
- I'm having problems configuring PHP3 to work with Apache. It says - it can't find httpd.h, but it's right where I said it is! -
-
- You need to tell the configure/setup script the location of the - top-level of your Apache source tree. This means that - you want to specify '--with-apache=/path/to/apache' - and not '--with-apache=/path/to/apache/src'. -

-

-
- When I run configure, it says that it can't find the include files or - library for GD, gdbm, or some other package! -
-
- You can make the configure script looks for header files and libraries - in non-standard locations by specifying additional flags to pass to - the C preprocessor and linker, such as: -
-    CPPFLAGS=-I/path/to/include LDFLAGS=-L/path/to/library ./configure
-
 - If you're using a csh-variant for your login shell (why?), it would be: -
-    env CPPFLAGS=-I/path/to/include LDFLAGS=-L/path/to/library ./configure
-
 -

-

- -
- When it is compiling the file language-parser.tab.c, it gives me errors - that say 'yytname undeclared'. -
-
- You need to update your version of Bison. You can find the latest version - at ftp://prep.ai.mit.edu/pub/gnu/. -

-

- -
- When I run 'make', it seems to run fine but then fails when it - tries to link the final application complaining that it can't find - some files. -
-
- Some old versions of make that don't correctly put the compiled - versions of the files in the functions directory into that same - directory. Try running "cp *.o functions" and then - re-running 'make' to see if that helps. If it does, you should really - upgrade to a recent version of GNU make. -

-

- -
- When linking PHP3, it complains about a number of undefined references. -
-
- Take a look at the link line and make sure that all of the appropriate - libraries are being included at the end. Common ones that you might have - missed are '-ldl' and any libraries required for any database support - you included. -

- If you're linking with Apache 1.2.x, did you remember to add the - appropriate information to the EXTRA_LIBS line of the Configuration - file and re-rerun Apache's Configure script? See the INSTALL file that - comes with the distribution for more information. -

- Some people have also reported that they had to add '-ldl' immediately - following 'libphp3.a' when linking with Apache. -

-

- -
- I can't figure out how to build PHP3 with Apache 1.3. -
-
-

This is actually quite easy. Follow these steps carefully: -

    -
  • Grab the latest Apache 1.3 distribution from www.apache.org. -
  • Ungzip and untar it somewhere, for example /usr/local/src/apache-1.3. -
  • Compile PHP3 by first running ./configure --with-apache=/<path>/apache-1.3 (substitute <path> for the actual path to your apache-1.3 directory. -
  • Type 'make' followed by 'make install' to build PHP3 and copy the - necessary files to the Apache distribution tree. -
  • Change directories into to your /<path>/apache-1.3/src directory and edit the Configuration file. At the end of the file, add: AddModule modules/php3/libphp3.a. -
  • Type: './Configure' followed by 'make'. -
  • You should now have a PHP3-enabled httpd binary! -
- Note: You can also use the new Apache ./configure script. See the instructions in the README.configure file - which is part of your Apache distribution. Also have a look at the INSTALL file in the PHP distribution. -

-

-
- -
- -

Using PHP3

- -
-
- I would like to write a generic PHP script that can handle data coming - from any form. How do I know which POST method variables are available? -
-
- You need to compile PHP with the "--enable-track-vars" configure switch. - This creates three associative arrays. $HTTP_GET_VARS, $HTTP_POST_VARS - and $HTTP_COOKIE_VARS. So, to write a generic script to handle POST - method variables you would need something similar to the following:
-    while (list($var, $value) = each($HTTP_POST_VARS)) {
-        echo "$var = $value<br>n";
-    }
-

-

- -
- I need to convert all single-quotes (') to a backslash followed by - a single-quote. How can I do this with a regular expression? -
-
- First off, take a look at the addslashes() function. It will do - exactly what you want. -

- The ereg_replace magic you're looking for, however, is simply:

-    $escaped = ereg_replace("'", "\'", $input);
-

-

- -
- When I do the following, the output is printed in the wrong order:
-      function myfunc($argument) {
-        echo $myfunc + 10;
-      }
-      $variable = 10;
-      echo "myfunc($variable) = " . myfunc($variable);
-
-

What's going on? -

-
- To be able to use the results of your function in an expression (such - as concatenating it with other strings in the example above), you need - to return the value, not echo it. -

-

- -
- Hey, what happened to my newlines in: -
-<PRE>
-  1 <?echo $result[1];?>
-  2 <?echo $result[2];?>
-
-
-
- In PHP, the ending for a block of code is either "?>" or - "?>n" (where n means a newline). This means that you need to - insert an extra newline after each block of PHP code in the above - example. -

- Why does PHP do this? Because when formatting normal HTML, this - usually makes your life easier because you don't want that newline, - but you'd have to create extremely long lines or otherwise make the - raw page source unreadable to achieve that effect. -

-

- -
- I need to access information in the request header directly. How can - I do this? -
-
- The getallheaders() function will do this if you are running PHP as a - module. So, the following bit of code will show you all the request - headers:
-    $headers = getallheaders();
-	for(reset($headers); $key = key($headers); next($headers)) {
-        echo "headers[$key] = ".$headers[$key]."<br>n";
-    }
-
-

-

- -
- When I try to use authentication with IIS I get 'No Input file specified' -
-
- The security model of IIS is at fault here. This is a problem - common to all CGI programs running under IIS. A workaround is - to create a plain HTML file (not parsed by php) as the entry page - into an authenticated directory. Then use a META tag to redirect - to the PHP page, or have a link to the PHP page. PHP will - then recognize the authentication correctly. When the ISAPI - module is ready, this will no longer be a problem. This should - not effect other NT web servers. For more information, see: http://support.microsoft.com/support/kb/articles/q160/4/22.asp. -

-

- -
- I've followed all the instructions, but still can't get PHP and IIS - to work together! -
-
- Make sure any user who needs to run a PHP script has the rights - to run php.exe! IIS uses an anonymous user which is added at the - time IIS is installed. This user needs rights to php.exe. Also, - any authenticated user will also need rights to execute php.exe. -

-

- -
- -

New Features

- -
-
- I saw PHP3 offers persistent database connections. What does that mean? -
-
- Persistent connections are SQL links that do not close when the - execution of your script ends. When a persistent connection is - requested, PHP checks if there's already an identical persistent - connection (that remained open from earlier) - and if it exists, it - uses it. If it does not exist, it creates the link. An 'identical' - connection is a connection that was opened to the same host, with - the same username and the same password (where applicable). - -

People who aren't thoroughly familiar with the way web servers - work and distribute the load may mistake persistent connects for what - they're not. In particular, they do not give you an ability - to open 'user sessions' on the same SQL link, they do not - give you an ability to build up a transaction efficently, and they - don't do a whole lot of other things. In fact, to be extremely - clear about the subject, persistent connections don't give you any - functionality that wasn't possible with their non-persistent brothers. - -

Why? - -

This has to do with the way web servers work. There are three ways - in which your web server can utilize PHP to generate web pages. - -

The first method is to use PHP as a CGI "wrapper". When run this - way, an instance of the PHP interpreter is created and destroyed for - every page request (for a PHP page) to your web server. Because it - is destroyed after every request, any resources that it acquires (such - as a link to an SQL database server) are closed when it is destroyed. - In this case, you do not gain anything from trying to use persistent - connections -- they simply don't persist. - -

The second, and most popular, method is to run PHP as a module - in a multiprocess web server, which currently only includes - Apache. A multiprocess server typically has one process (the parent) - which coordinates a set of processes (its children) who actually do - the work of serving up web pages. When each request comes in from a a - client, it is handed off to one of the children that is not already - serving another client. This means that when the same client makes - a second request to the server, it may be serviced by a different - child process than the first time. What a persistent connection does - for you in this case it make it so each child process only needs - to connect to your SQL server the first time that it serves a page - that makes us of such a connection. When another page then requires - a connection to the SQL server, it can reuse the connection that - child established earlier. - -

The last method is to use PHP as a plug-in for a multithreaded - web server. Currently this is only theoretical -- PHP does not - yet work as a plug-in for any multithreaded web servers. Work is - progressing on support for ISAPI, WSAPI, and NSAPI (on Windows), - which will all allow PHP to be used as a plug-in on multithreaded - servers like Netscape FastTrack, Microsoft's Internet Information - Server (IIS), and O'Reilly's WebSite Pro. When this happens, the - behavior will be essentially the same as for the multiprocess model - described before. - -

If persistent connections don't have any added functionality, - what are they good for? - -

The answer here is extremely simple -- efficiency. Persistent - connections are good if the overhead to create a link to your SQL - server is high. Whether or not this overhead is really high depends - on many factors. Like, what kind of database it is, whether or - not it sits on the same computer on which your web server sits, - how loaded the machine the SQL server sits on is and so forth. - The bottom line is that if that connection overhead is high, - persistent connections help you considerably. They cause the child - process to simply connect only once for its entire lifespan, instead - of every time it processes a page that requires connecting to the - SQL server. This means that for every child that opened a persistent - connection will have its own open persistent connection to the server. - For example, if you had 20 different child processes that ran a script - that made a persistent connection to your SQL server, you'd have 20 - different connections to the SQL server, one from each child. - -

An important summary. Persistent connections were designed to - have one-to-one mapping to regular connections. That means that you - should always be able to replace persistent connections with - non-persistent connections, and it won't change the way your script - behaves. It may (and probably will) change the efficiency - of the script, but not its behavior! -

-

-
- -

Common Problems

- -
-
- I installed PHP3, but every time I load a document, I get the - message 'Document Contains No Data'! What's going on here? -
-
- This probably means that PHP3 is having some sort of problem - and is core-dumping. Look in your server error log to see if - this is the case, and then try to reproduce the problem with - a small test case. If you know how to use 'gdb', it is very - helpful when you can provide a backtrace with your bug report - to help the developers pinpoint the problem. -

- If your script uses the regular expression functions (ereg() - and friends), you should make sure that you compiled PHP3 and - Apache with the same regular expression package. (This should - happen automatically with PHP3 and Apache 1.3.) -

-

- -
- I'm trying to access one of the standard CGI variables (such - as $DOCUMENT_ROOT or $HTTP_REFERER) in a user-defined function, - and it can't seem to find it. What's wrong? -
-
- Environment variables are now normal global variables, so you must - either declare them as global variables in your function (by using - "global $DOCUMENT_ROOT;", for example) or by using - the global variable array (ie, "$GLOBALS["DOCUMENT_ROOT"]". -

-

- -
- I think I found a bug! Who should I tell? -
-
- You should go to the PHP Bug Database and make sure the bug - isn't a known bug. If you don't see it in the database, use - the reporting form to report the bug. It is important to use - the bug database instead of just sending an email to one of the - mailing lists because the bug will have a tracking number assigned - and it will then be possible for you to go back later and check - on the status of the bug. The bug database can be found at http://ca.php.net/bugs.php3. -

-

-
- -
- -

Migrating from PHP/FI 2.0

- -

Common Problems

- -
-
- When I add two strings together and then echo it, it echoes zero instead - of the concatenation of the two strings! What's going on? Wouldn't it - be great if adding two strings just concatenated them together? -
-
- PHP3 does not support the overloading of the addition operator for - strings because values that arrive via the GET and POST methods and - from databases are always stored as strings. This means that if the - plus operator were overloaded to concatenate strings, you could add - what you thought were two numbers and get the wrong result! (For - example, "4" + "5" would be equal to "45".) One way around this would - be to explicitly type-cast one or both of the operands, which is what - PHP/FI 2 did. - -

This has been simplified in PHP3 by the addition of a real string - concatenation operator. If you want to "add" two strings together, - just write it like: "this" . "that" which will result in - the string "thisthat". - -

The answer to the final part of the question is an emphatic no. - Operator overloading can be a source of great confusion, especially - when variables aren't very strongly typed to begin with, as they are - in PHP3. -

-

- -
- When I use the chmod(), umask(), or mkdir() functions, the permissions - are wrong! -
-
- Unlike PHP/FI 2, PHP3 does not interpret the numeric arguments for - these functions any differently than for any other function, which - means you need to pass in an octal value if you are specifying an - octal number, such as: -
-        chmod($myfile, 0600);
-
- not -
-        chmod($myfile, 600);
-
-

-

- -
- I converted my script from PHP/FI 2.0 to PHP3 syntax, but now it just - hangs! When I looked at the processes running on my server, there was - one process that was chewing up all of the CPU cycles! -
-
- You probably missed the semi-colon on a while - (condition); statement. This will cause PHP3 to spin out of - control because it is simply executing an empty body for your while - loop! Change the semi-colon to a colon and it should work correctly. -

-

- -
- My user-functions don't work any more! I get a "Parse error (expecting '('" - on the first line of the function. -
-
- PHP3's function declaration now resembles C function declarations, so - your function should look like: - 
-        function printsum($a, $b) {
-           echo $a + $b;
-        }
-
-

You can also use old-style function declarations by use the - 'old_function' designation, like so: - 

-        old_function printsum $a, $b (
-           echo $a + $b;
-        );
-
-

-

-
- -
- -

Credits

- -

This FAQ was originally written by Jim Winstead. It is currently -maintained by the PHP Development Team. - -

- -

-
-
- 		-
-
- - - - -
-
-Who's responsible for this?
-Top of this page
-
-
- 		- - - - - -
- - - - - - -
- - Site
Hosting:
- 		-
- 		-
-
- 		- - - - - - - -
- -Located in
United States 		- -
-
-
- - - diff --git a/php-4.1.2-dom-xslt-patch b/php-4.1.2-dom-xslt-patch deleted file mode 100644 index 0d0d65a..0000000 --- a/php-4.1.2-dom-xslt-patch +++ /dev/null @@ -1,1802 +0,0 @@ -diff -upr php-4.1.2/ext/domxml/config.m4 php-4.1.2-dom-xslt/ext/domxml/config.m4 ---- php-4.1.2/ext/domxml/config.m4 Thu Oct 4 08:42:45 2001 -+++ php-4.1.2-dom-xslt/ext/domxml/config.m4 Fri Jan 18 08:58:47 2002 -@@ -1,5 +1,6 @@ --dnl $Id$ --dnl config.m4 for extension domxml -+dnl -+dnl $Id$ -+dnl - - AC_DEFUN(PHP_DOM_CHECK_VERSION,[ - old_CPPFLAGS=$CPPFLAGS -@@ -20,17 +21,16 @@ AC_DEFUN(PHP_DOM_CHECK_VERSION,[ - - PHP_ARG_WITH(dom, for DOM support, - [ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.2). -- DIR is the libxml install directory, -- defaults to /usr.]) -+ DIR is the libxml install directory.]) - - if test "$PHP_DOM" != "no"; then - - DOMXML_DIR_ADD="" -- if test -r $PHP_DOM/include/libxml/tree.h; then -- DOMXML_DIR=$PHP_DOM -- elif test -r $PHP_DOM/include/libxml2/libxml/tree.h; then -+ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then - DOMXML_DIR=$PHP_DOM - DOMXML_DIR_ADD="/libxml2" -+ elif test -r $PHP_DOM/include/libxml/tree.h; then -+ DOMXML_DIR=$PHP_DOM - else - for i in /usr/local /usr; do - test -r $i/include/libxml/tree.h && DOMXML_DIR=$i -@@ -63,4 +63,110 @@ if test "$PHP_DOM" != "no"; then - AC_DEFINE(HAVE_DOMXML,1,[ ]) - PHP_EXTENSION(domxml, $ext_shared) - PHP_SUBST(DOMXML_SHARED_LIBADD) -+fi -+ -+AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$DOMXSLT_DIR/include -+ AC_MSG_CHECKING(for libxslt version) -+ AC_EGREP_CPP(yes,[ -+ #include -+ #if LIBXSLT_VERSION >= 10003 -+ yes -+ #endif -+ ],[ -+ AC_MSG_RESULT(>= 1.0.3) -+ ],[ -+ AC_MSG_ERROR(libxslt version 1.0.3 or greater required.) -+ ]) -+ CPPFLAGS=$old_CPPFLAGS -+]) -+ -+AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$DOMEXSLT_DIR/include -+ AC_MSG_CHECKING(for libexslt version) -+ AC_EGREP_CPP(yes,[ -+ #include -+ #if LIBEXSLT_VERSION >= 600 -+ yes -+ #endif -+ ],[ -+ AC_MSG_RESULT(>= 1.0.3) -+ ],[ -+ AC_MSG_ERROR(libxslt version 1.0.3 or greater required.) -+ ]) -+ CPPFLAGS=$old_CPPFLAGS -+]) -+ -+PHP_ARG_WITH(dom-xslt, for DOM XSLT support, -+[ --with-dom-xslt[=DIR] Include DOM XSLT support (requires libxslt >= 1.0.3). -+ DIR is the libxslt install directory.]) -+ -+PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, -+[ --with-dom-exslt[=DIR] Include DOM EXSLT support (requires libxslt >= 1.0.3). -+ DIR is the libexslt install directory.]) -+ -+if test "$PHP_DOM_XSLT" != "no"; then -+ -+ if test -r $PHP_DOM_XSLT/include/libxslt/transform.h; then -+ DOMXSLT_DIR=$PHP_DOM_XSLT -+ else -+ for i in /usr/local /usr; do -+ test -r $i/include/libxslt/transform.h && DOMXSLT_DIR=$i -+ done -+ fi -+ -+ if test -z "$DOMXSLT_DIR"; then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR(Please reinstall the libxslt >= 1.0.3 distribution) -+ fi -+ -+ PHP_DOM_XSLT_CHECK_VERSION -+ -+ PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) -+ -+ PHP_ADD_INCLUDE($DOMXSLT_DIR/include) -+ -+ if test "$PHP_DOM" = "no"; then -+ AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=) -+ fi -+ -+ AC_DEFINE(HAVE_DOMXSLT,1,[ ]) -+ -+ PHP_SUBST(DOMXML_SHARED_LIBADD) -+fi -+ -+if test "$PHP_DOM_EXSLT" != "no"; then -+ if test "$PHP_DOM" = "no"; then -+ AC_MSG_ERROR(DOMEXSLT requires DOMXML. Use --with-dom=) -+ fi -+ -+ if test "$PHP_DOM_XSLT" = "no"; then -+ AC_MSG_ERROR(DOMEXSLT requires DOMXSLT. Use --with-dom-xslt=) -+ fi -+ -+ if test -r $PHP_DOM_EXSLT/include/libexslt/exslt.h; then -+ DOMEXSLT_DIR=$PHP_DOM_EXSLT -+ else -+ for i in /usr/local /usr; do -+ test -r $i/include/libexslt/exslt.h && DOMEXSLT_DIR=$i -+ done -+ fi -+ -+ if test -z "$DOMEXSLT_DIR"; then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR(Please reinstall the libxslt >= 1.0.3 distribution) -+ fi -+ -+ PHP_DOM_EXSLT_CHECK_VERSION -+ -+ PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD) -+ -+ PHP_ADD_INCLUDE($DOMEXSLT_DIR/include) -+ -+ AC_DEFINE(HAVE_DOMEXSLT,1,[ ]) -+ -+ PHP_SUBST(DOMXML_SHARED_LIBADD) -+ - fi -diff -upr php-4.1.2/ext/domxml/php_domxml.c php-4.1.2-dom-xslt/ext/domxml/php_domxml.c ---- php-4.1.2/ext/domxml/php_domxml.c Fri Dec 14 11:45:46 2001 -+++ php-4.1.2-dom-xslt/ext/domxml/php_domxml.c Tue Feb 26 17:03:46 2002 -@@ -16,7 +16,11 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id$ */ -+/* $Id$ */ -+ -+/* TODO -+ * - Support Notation Nodes -+ * */ - - - #ifdef HAVE_CONFIG_H -@@ -33,7 +37,7 @@ - - /* General macros used by domxml */ - #define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret TSRMLS_CC))) { \ -- php_error(E_WARNING, "%s() cannot create required DOM object", \ -+ php_error(E_WARNING, "%s(): cannot create required DOM object", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } -@@ -46,13 +50,13 @@ - DOMXML_RET_ZVAL(zval); - - #define DOMXML_GET_THIS(zval) if (NULL == (zval = getThis())) { \ -- php_error(E_WARNING, "%s() underlying object missing", \ -+ php_error(E_WARNING, "%s(): underlying object missing", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } - - #define DOMXML_GET_OBJ(ret, zval, le) if (NULL == (ret = php_dom_get_object(zval, le, 0 TSRMLS_CC))) { \ -- php_error(E_WARNING, "%s() cannot fetch DOM object", \ -+ php_error(E_WARNING, "%s(): cannot fetch DOM object", \ - get_active_function_name(TSRMLS_C)); \ - RETURN_FALSE; \ - } -@@ -80,6 +84,17 @@ - } \ - DOMXML_GET_OBJ(ret, zval, le); - -+#define DOMXML_PARAM_ONE(ret, zval, le, s, p1) if (NULL == (zval = getThis())) { \ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1) == FAILURE) { \ -+ return; \ -+ } \ -+ } else { \ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, p1) == FAILURE) { \ -+ return; \ -+ } \ -+ } \ -+ DOMXML_GET_OBJ(ret, zval, le); -+ - #define DOMXML_PARAM_TWO(ret, zval, le, s, p1, p2) if (NULL == (zval = getThis())) { \ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2) == FAILURE) { \ - return; \ -@@ -91,6 +106,18 @@ - } \ - DOMXML_GET_OBJ(ret, zval, le); - -+#define DOMXML_PARAM_THREE(ret, zval, le, s, p1, p2, p3) if (NULL == (zval = getThis())) { \ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2, p3) == FAILURE) { \ -+ return; \ -+ } \ -+ } else { \ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, p1, p2, p3) == FAILURE) { \ -+ return; \ -+ } \ -+ } \ -+ DOMXML_GET_OBJ(ret, zval, le); -+ -+ - #define DOMXML_PARAM_FOUR(ret, zval, le, s, p1, p2, p3, p4) if (NULL == (zval = getThis())) { \ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o"s, &zval, p1, p2, p3, p4) == FAILURE) { \ - return; \ -@@ -102,6 +129,7 @@ - } \ - DOMXML_GET_OBJ(ret, zval, le); - -+ - static int le_domxmldocp; - static int le_domxmldoctypep; - static int le_domxmldtdp; -@@ -116,6 +144,9 @@ static int le_domxmlnotationp; - /*static int le_domxmlentityp;*/ - static int le_domxmlentityrefp; - /*static int le_domxmlnsp;*/ -+#if HAVE_DOMXSLT -+static int le_domxsltstylesheetp; -+#endif - - #if defined(LIBXML_XPATH_ENABLED) - static int le_xpathctxp; -@@ -140,6 +171,9 @@ zend_class_entry *domxmlns_class_entry; - zend_class_entry *xpathctx_class_entry; - zend_class_entry *xpathobject_class_entry; - #endif -+#if HAVE_DOMXSLT -+zend_class_entry *domxsltstylesheet_class_entry; -+#endif - - - static int node_attributes(zval **attributes, xmlNode *nodep TSRMLS_DC); -@@ -149,28 +183,48 @@ static zend_function_entry domxml_functi - PHP_FE(domxml_version, NULL) - PHP_FE(xmldoc, NULL) - PHP_FE(xmldocfile, NULL) -+#if defined(LIBXML_HTML_ENABLED) -+ PHP_FE(html_doc, NULL) -+ PHP_FE(html_doc_file, NULL) -+#endif - PHP_FE(xmltree, NULL) -+ PHP_FE(domxml_substitute_entities_default, NULL) - PHP_FE(domxml_add_root, NULL) -- PHP_FE(domxml_dumpmem, NULL) -+ PHP_FE(domxml_dump_mem, NULL) -+ PHP_FE(domxml_dump_mem_file, NULL) -+ PHP_FE(domxml_dump_node, NULL) -+#if defined(LIBXML_HTML_ENABLED) -+ PHP_FE(domxml_html_dump_mem, NULL) -+#endif - PHP_FE(domxml_node_attributes, NULL) - PHP_FE(domxml_elem_get_attribute, NULL) - PHP_FE(domxml_elem_set_attribute, NULL) - PHP_FE(domxml_node_children, NULL) -+ PHP_FE(domxml_node_has_attributes, NULL) - PHP_FE(domxml_node_new_child, NULL) - PHP_FE(domxml_node, NULL) - PHP_FE(domxml_node_unlink_node, NULL) - PHP_FE(domxml_node_set_content, NULL) -+ PHP_FE(domxml_node_get_content, NULL) - PHP_FE(domxml_new_xmldoc, NULL) - - #if defined(LIBXML_XPATH_ENABLED) - PHP_FE(xpath_new_context, NULL) - PHP_FE(xpath_eval, NULL) - PHP_FE(xpath_eval_expression, NULL) -+ PHP_FE(xpath_register_ns, NULL) - #endif - #if defined(LIBXML_XPTR_ENABLED) - PHP_FE(xptr_new_context, NULL) - PHP_FE(xptr_eval, NULL) - #endif -+#if HAVE_DOMXSLT -+ PHP_FE(domxml_xslt_version, NULL) -+ PHP_FE(domxml_xslt_stylesheet, NULL) -+ PHP_FE(domxml_xslt_stylesheet_doc, NULL) -+ PHP_FE(domxml_xslt_stylesheet_file, NULL) -+ PHP_FE(domxml_xslt_process, NULL) -+#endif - - PHP_FALIAS(domxml_root, domxml_doc_document_element, NULL) - PHP_FALIAS(domxml_attributes, domxml_node_attributes, NULL) -@@ -183,6 +237,8 @@ static zend_function_entry domxml_functi - PHP_FALIAS(domxml_unlink_node, domxml_node_unlink_node, NULL) - PHP_FALIAS(set_content, domxml_node_set_content, NULL) - PHP_FALIAS(new_xmldoc, domxml_new_xmldoc, NULL) -+ PHP_FALIAS(domxml_dumpmem, domxml_dump_mem, NULL) -+ - {NULL, NULL, NULL} - }; - -@@ -206,7 +262,12 @@ static function_entry php_domxmldoc_clas - PHP_FALIAS(add_root, domxml_add_root, NULL) - PHP_FALIAS(imported_node, domxml_doc_imported_node, NULL) - PHP_FALIAS(dtd, domxml_intdtd, NULL) -- PHP_FALIAS(dumpmem, domxml_dumpmem, NULL) -+ PHP_FALIAS(dumpmem, domxml_dump_mem, NULL) -+ PHP_FALIAS(dump_mem, domxml_dump_mem, NULL) -+ PHP_FALIAS(dump_mem_file, domxml_dump_mem_file, NULL) -+#if defined(LIBXML_HTML_ENABLED) -+ PHP_FALIAS(html_dump_mem, domxml_html_dump_mem, NULL) -+#endif - #if defined(LIBXML_XPATH_ENABLED) - PHP_FALIAS(xpath_init, xpath_init, NULL) - PHP_FALIAS(xpath_new_context, xpath_new_context, NULL) -@@ -217,13 +278,13 @@ static function_entry php_domxmldoc_clas - - static function_entry php_domxmldoctype_class_functions[] = { - PHP_FALIAS(name, domxml_doctype_name, NULL) --/* -+/* - PHP_FALIAS(entities, domxml_doctype_entities, NULL) - PHP_FALIAS(notations, domxml_doctype_notations, NULL) - PHP_FALIAS(system_id, domxml_doctype_system_id, NULL) - PHP_FALIAS(public_id, domxml_doctype_public_id, NULL) - PHP_FALIAS(internal_subset, domxml_doctype_internal_subset, NULL) --*/ -+*/ - {NULL, NULL, NULL} - }; - -@@ -249,16 +310,20 @@ static zend_function_entry php_domxmlnod - PHP_FALIAS(owner_document, domxml_node_owner_document, NULL) - PHP_FALIAS(new_child, domxml_node_new_child, NULL) - PHP_FALIAS(attributes, domxml_node_attributes, NULL) -+ PHP_FALIAS(has_attributes, domxml_node_has_attributes, NULL) - PHP_FALIAS(node, domxml_node, NULL) - PHP_FALIAS(unlink, domxml_node_unlink_node, NULL) -+ PHP_FALIAS(replace_node, domxml_node_replace_node, NULL) - PHP_FALIAS(set_content, domxml_node_set_content, NULL) -+ PHP_FALIAS(get_content, domxml_node_get_content, NULL) - PHP_FALIAS(text_concat, domxml_node_text_concat, NULL) - PHP_FALIAS(set_name, domxml_node_set_name, NULL) - PHP_FALIAS(node_name, domxml_node_name, NULL) - PHP_FALIAS(node_type, domxml_node_type, NULL) - PHP_FALIAS(node_value, domxml_node_value, NULL) - PHP_FALIAS(clone_node, domxml_clone_node, NULL) -- PHP_FALIAS(is_blank_node, domxml_is_blank_node, NULL) -+ PHP_FALIAS(is_blank_node, domxml_is_blank_node, NULL) -+ PHP_FALIAS(dump_node, domxml_dump_node, NULL) - {NULL, NULL, NULL} - }; - -@@ -299,7 +364,7 @@ static zend_function_entry php_domxmlent - }; - - static zend_function_entry php_domxmlentity_class_functions[] = { --/* -+/* - PHP_FALIAS(public_id, domxml_entity_public_id, NULL) - PHP_FALIAS(system_id, domxml_entity_system_id, NULL) - PHP_FALIAS(notation_name, domxml_entity_notation_name, NULL) -@@ -317,6 +382,7 @@ static zend_function_entry php_domxmlpi_ - static zend_function_entry php_xpathctx_class_functions[] = { - PHP_FALIAS(xpath_eval, xpath_eval, NULL) - PHP_FALIAS(xpath_eval_expression, xpath_eval_expression, NULL) -+ PHP_FALIAS(xpath_register_ns, xpath_register_ns, NULL) - {NULL, NULL, NULL} - }; - -@@ -329,7 +395,7 @@ static zend_function_entry php_domxmlatt - PHP_FALIAS(name, domxml_attr_name, NULL) - PHP_FALIAS(value, domxml_attr_value, NULL) - PHP_FALIAS(specified, domxml_attr_specified, NULL) --/* -+/* - PHP_FALIAS(owner_element, domxml_attr_owner_element, NULL) - */ - {NULL, NULL, NULL} -@@ -339,8 +405,16 @@ static zend_function_entry php_domxmlns_ - {NULL, NULL, NULL} - }; - -+#if HAVE_DOMXSLT -+static zend_function_entry php_domxsltstylesheet_class_functions[] = { -+/* TODO: maybe some more methods? */ -+ PHP_FALIAS(process, domxml_xslt_process, NULL) -+ {NULL, NULL, NULL} -+}; -+#endif -+ - zend_module_entry domxml_module_entry = { -- STANDARD_MODULE_HEADER, -+ STANDARD_MODULE_HEADER, - "domxml", - domxml_functions, - PHP_MINIT(domxml), -@@ -348,7 +422,7 @@ zend_module_entry domxml_module_entry = - PHP_RINIT(domxml), - NULL, - PHP_MINFO(domxml), -- NO_VERSION_YET, -+ NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES - }; - -@@ -370,14 +444,14 @@ static void dom_object_set_data(void *ob - - static zval *dom_object_get_data(void *obj) - { --/* -+/* - char tmp[20]; - sprintf(tmp, "%08X", obj); - fprintf(stderr, "Trying getting %s from object ...", tmp); - if(((xmlNodePtr) obj)->_private) - fprintf(stderr, " found\n"); - else -- fprintf(stderr, " not found\n"); -+ fprintf(stderr, " not found\n"); - */ - return ((zval *) (((xmlNodePtr) obj)->_private)); - } -@@ -411,9 +485,14 @@ static inline void node_list_wrapper_dto - { - while (node != NULL) { - node_list_wrapper_dtor(node->children); -- // FIXME temporary fix; think of something better -- if (node->type != XML_ATTRIBUTE_DECL && node->type != XML_DTD_NODE) { -- attr_list_wrapper_dtor(node->properties); -+ switch (node->type) { -+ /* Skip property freeing for the following types */ -+ case XML_ATTRIBUTE_DECL: -+ case XML_DTD_NODE: -+ case XML_ENTITY_DECL: -+ break; -+ default: -+ attr_list_wrapper_dtor(node->properties); - } - node_wrapper_dtor(node); - node = node->next; -@@ -474,6 +553,92 @@ static void php_free_xpath_object(zend_r - #endif - - -+#if HAVE_DOMXSLT -+static void php_free_xslt_stylesheet(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+{ -+ xsltStylesheetPtr sheet = (xsltStylesheetPtr) rsrc->ptr; -+ -+ if (sheet) { -+ node_wrapper_dtor((xmlNodePtr) sheet); -+ xsltFreeStylesheet(sheet); -+ } -+} -+ -+static void xsltstylesheet_set_data(void *obj, zval *wrapper) -+{ -+/* -+ char tmp[20]; -+ sprintf(tmp, "%08X", obj); -+ fprintf(stderr, "Adding %s to hash\n", tmp); -+*/ -+ ((xsltStylesheetPtr) obj)->_private = wrapper; -+} -+ -+ -+static zval *xsltstylesheet_get_data(void *obj) -+{ -+/* -+ char tmp[20]; -+ sprintf(tmp, "%08X", obj); -+ fprintf(stderr, "Trying getting %s from object ...", tmp); -+ if(((xmlNodePtr) obj)->_private) -+ fprintf(stderr, " found\n"); -+ else -+ fprintf(stderr, " not found\n"); -+*/ -+ return ((zval *) (((xsltStylesheetPtr) obj)->_private)); -+} -+ -+void *php_xsltstylesheet_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC) -+{ -+ void *obj; -+ zval **handle; -+ int type; -+ -+ if (NULL == wrapper) { -+ php_error(E_WARNING, "xsltstylesheet_get_object() invalid wrapper object passed"); -+ return NULL; -+ } -+ -+ if (Z_TYPE_P(wrapper) != IS_OBJECT) { -+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C)); -+ return NULL; -+ } -+ -+ if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { -+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C)); -+ return NULL; -+ } -+ -+ obj = zend_list_find(Z_LVAL_PP(handle), &type); -+ if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) { -+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); -+ return NULL; -+ } -+ -+ return obj; -+} -+ -+static void php_xsltstylesheet_set_object(zval *wrapper, void *obj, int rsrc_type) -+{ -+ zval *handle, *addr; -+ -+ MAKE_STD_ZVAL(handle); -+ Z_TYPE_P(handle) = IS_LONG; -+ Z_LVAL_P(handle) = zend_list_insert(obj, rsrc_type); -+ -+ MAKE_STD_ZVAL(addr); -+ Z_TYPE_P(addr) = IS_LONG; -+ Z_LVAL_P(addr) = (int) obj; -+ -+ zend_hash_index_update(Z_OBJPROP_P(wrapper), 0, &handle, sizeof(zval *), NULL); -+ zend_hash_index_update(Z_OBJPROP_P(wrapper), 1, &addr, sizeof(zval *), NULL); -+ zval_add_ref(&wrapper); -+ xsltstylesheet_set_data(obj, wrapper); -+} -+#endif /* HAVE_DOMXSLT */ -+ -+ - void *php_xpath_get_object(zval *wrapper, int rsrc_type1, int rsrc_type2 TSRMLS_DC) - { - void *obj; -@@ -486,18 +651,18 @@ void *php_xpath_get_object(zval *wrapper - } - - if (Z_TYPE_P(wrapper) != IS_OBJECT) { -- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C)); - return NULL; - } - - if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { -- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C)); - return NULL; - } - - obj = zend_list_find(Z_LVAL_PP(handle), &type); - if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) { -- php_error(E_WARNING, "%s() underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); - return NULL; - } - -@@ -507,7 +672,7 @@ void *php_xpath_get_object(zval *wrapper - - static void xpath_object_set_data(void *obj, zval *wrapper) - { --/* -+/* - char tmp[20]; - sprintf(tmp, "%08X", obj); - fprintf(stderr, "Adding %s to hash\n", tmp); -@@ -518,12 +683,12 @@ static void xpath_object_set_data(void * - - static zval *xpath_object_get_data(void *obj) - { --/* -+/* - char tmp[20]; - sprintf(tmp, "%08X", obj); -- fprintf(stderr, "Trying getting %s from hash ...", tmp); -+ fprintf(stderr, "Trying getting %s from hash ...", tmp); - if(((xmlXPathObjectPtr) obj)->user) -- fprintf(stderr, " found\n"); -+ fprintf(stderr, " found\n"); - else - fprintf(stderr, " not found\n"); - */ -@@ -574,7 +739,7 @@ static zval *php_xpathobject_new(xmlXPat - - /* - rsrc_type = le_xpathobjectp; -- php_xpath_set_object(wrapper, (void *) obj, rsrc_type); -+ php_xpath_set_object(wrapper, (void *) obj, rsrc_type); - */ - - php_xpath_set_object(wrapper, (void *) obj, le_xpathobjectp); -@@ -594,19 +759,19 @@ void *php_xpath_get_context(zval *wrappe - } - - if (Z_TYPE_P(wrapper) != IS_OBJECT) { -- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C)); - return NULL; - } - - if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == - FAILURE) { -- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C)); - return NULL; - } - - obj = zend_list_find(Z_LVAL_PP(handle), &type); - if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) { -- php_error(E_WARNING, "%s() Underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); - return NULL; - } - -@@ -628,9 +793,9 @@ static zval *xpath_context_get_data(void - /* - char tmp[20]; - sprintf(tmp, "%08X", obj); -- fprintf(stderr, "Trying getting %s from hash ...", tmp); -+ fprintf(stderr, "Trying getting %s from hash ...", tmp); - if(((xmlXPathContextPtr) obj)->user) -- fprintf(stderr, " found\n"); -+ fprintf(stderr, " found\n"); - else - fprintf(stderr, " not found\n"); - */ -@@ -661,7 +826,7 @@ static zval *php_xpathcontext_new(xmlXPa - int rsrc_type; - - if (! found) { -- *found = 0; -+ *found = 0; - } - - if (!obj) { -@@ -677,8 +842,8 @@ static zval *php_xpathcontext_new(xmlXPa - } - - MAKE_STD_ZVAL(wrapper); --/* -- fprintf(stderr, "Adding new XPath Context\n"); -+/* -+ fprintf(stderr, "Adding new XPath Context\n"); - */ - object_init_ex(wrapper, xpathctx_class_entry); - rsrc_type = le_xpathctxp; -@@ -700,12 +865,12 @@ void *php_dom_get_object(zval *wrapper, - } - - if (Z_TYPE_P(wrapper) != IS_OBJECT) { -- php_error(E_WARNING, "%s() wrapper is not an object", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): wrapper is not an object", get_active_function_name(TSRMLS_C)); - return NULL; - } - - if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { -- php_error(E_WARNING, "%s() underlying object missing", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing", get_active_function_name(TSRMLS_C)); - return NULL; - } - -@@ -713,7 +878,7 @@ void *php_dom_get_object(zval *wrapper, - - /* The following test should be replaced with search in all parents */ - if (!obj) { /* || ((type != rsrc_type1) && (type != rsrc_type2))) { */ -- php_error(E_WARNING, "%s() underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): underlying object missing or of invalid type", get_active_function_name(TSRMLS_C)); - return NULL; - } - -@@ -747,7 +912,7 @@ static zval *php_domobject_new(xmlNodePt - int rsrc_type; - - if (! found) { -- *found = 0; -+ *found = 0; - } - - if (!obj) { -@@ -795,8 +960,10 @@ static zval *php_domobject_new(xmlNodePt - object_init_ex(wrapper, domxmlcomment_class_entry); - rsrc_type = le_domxmlcommentp; - content = xmlNodeGetContent(nodep); -- if (content) -+ if (content) { -+ add_property_long(wrapper, "type", Z_TYPE_P(nodep)); - add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1); -+ } - break; - } - -@@ -817,7 +984,6 @@ static zval *php_domobject_new(xmlNodePt - xmlNodePtr nodep = obj; - object_init_ex(wrapper, domxmlentityref_class_entry); - rsrc_type = le_domxmlentityrefp; -- content = xmlNodeGetContent(nodep); - add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1); - break; - } -@@ -851,8 +1017,10 @@ static zval *php_domobject_new(xmlNodePt - } - - case XML_DOCUMENT_NODE: -+ case XML_HTML_DOCUMENT_NODE: - { - xmlDocPtr docp = (xmlDocPtr) obj; -+ - object_init_ex(wrapper, domxmldoc_class_entry); - rsrc_type = le_domxmldocp; - if (docp->name) -@@ -863,7 +1031,10 @@ static zval *php_domobject_new(xmlNodePt - add_property_stringl(wrapper, "url", (char *) docp->URL, strlen(docp->URL), 1); - else - add_property_stringl(wrapper, "url", "", 0, 1); -- add_property_stringl(wrapper, "version", (char *) docp->version, strlen(docp->version), 1); -+ if (docp->version) -+ add_property_stringl(wrapper, "version", (char *) docp->version, strlen(docp->version), 1); -+ else -+ add_property_stringl(wrapper, "version", "", 0, 1); - if (docp->encoding) - add_property_stringl(wrapper, "encoding", (char *) docp->encoding, strlen(docp->encoding), 1); - add_property_long(wrapper, "standalone", docp->standalone); -@@ -900,8 +1071,8 @@ static zval *php_domobject_new(xmlNodePt - break; - } - -- default: -- php_error(E_WARNING, "%s() unsupported node type: %d\n", get_active_function_name(TSRMLS_C), Z_TYPE_P(obj)); -+ default: -+ php_error(E_WARNING, "%s(): unsupported node type: %d\n", get_active_function_name(TSRMLS_C), Z_TYPE_P(obj)); - FREE_ZVAL(wrapper); - return NULL; - } -@@ -911,6 +1082,17 @@ static zval *php_domobject_new(xmlNodePt - } - - -+static void domxml_error(void *ctx, const char *msg, ...) -+{ -+ char buf[1024]; -+ va_list ap; -+ va_start(ap, msg); -+ vsnprintf(buf, 1024, msg, ap); -+ va_end(ap); -+ php_error(E_WARNING, buf); -+} -+ -+ - PHP_RINIT_FUNCTION(domxml) - { - return SUCCESS; -@@ -932,12 +1114,12 @@ PHP_MINIT_FUNCTION(domxml) - le_domxmlelementp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domelement", module_number); - le_domxmldtdp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domdtd", module_number); - le_domxmlcdatap = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domcdata", module_number); -+ le_domxmlentityrefp = zend_register_list_destructors_ex(php_free_xml_node, NULL, "domentityref", module_number); -+ le_domxmlpip = zend_register_list_destructors_ex(php_free_xml_node, NULL, "dompi", module_number); - - /* Not yet initialized le_*s */ - le_domxmldoctypep = -10000; -- le_domxmlpip = -10002; - le_domxmlnotationp = -10003; -- le_domxmlentityrefp = -10004; - - #if defined(LIBXML_XPATH_ENABLED) - le_xpathctxp = zend_register_list_destructors_ex(php_free_xpath_context, NULL, "xpathcontext", module_number); -@@ -946,6 +1128,10 @@ PHP_MINIT_FUNCTION(domxml) - - /* le_domxmlnsp = register_list_destructors(NULL, NULL); */ - -+#if HAVE_DOMXSLT -+ le_domxsltstylesheetp = zend_register_list_destructors_ex(php_free_xslt_stylesheet, NULL, "xsltstylesheet", module_number); -+#endif -+ - INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNode", php_domxmlnode_class_functions, NULL, NULL, NULL); - domxmlnode_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); - -@@ -996,6 +1182,11 @@ PHP_MINIT_FUNCTION(domxml) - xpathobject_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); - #endif - -+#if HAVE_DOMXSLT -+ INIT_OVERLOADED_CLASS_ENTRY(ce, "XsltStylesheet", php_domxsltstylesheet_class_functions, NULL, NULL, NULL); -+ domxsltstylesheet_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); -+#endif -+ - REGISTER_LONG_CONSTANT("XML_ELEMENT_NODE", XML_ELEMENT_NODE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_ATTRIBUTE_NODE", XML_ATTRIBUTE_NODE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("XML_TEXT_NODE", XML_TEXT_NODE, CONST_CS | CONST_PERSISTENT); -@@ -1040,6 +1231,15 @@ PHP_MINIT_FUNCTION(domxml) - REGISTER_LONG_CONSTANT("XPATH_USERS", XPATH_USERS, CONST_CS | CONST_PERSISTENT); - #endif - -+ xmlSetGenericErrorFunc(xmlGenericErrorContext, (xmlGenericErrorFunc)domxml_error); -+#if HAVE_DOMXSLT -+ xsltSetGenericErrorFunc(xsltGenericErrorContext, (xmlGenericErrorFunc)domxml_error); -+#if HAVE_DOMEXSLT -+ exsltRegisterAll(); -+#endif -+#endif -+ -+ - return SUCCESS; - } - -@@ -1065,12 +1265,24 @@ PHP_MINFO_FUNCTION(domxml) - php_info_print_table_start(); - php_info_print_table_row(2, "DOM/XML", "enabled"); - php_info_print_table_row(2, "libxml Version", LIBXML_DOTTED_VERSION); -+#if defined(LIBXML_HTML_ENABLED) -+ php_info_print_table_row(2, "HTML Support", "enabled"); -+#endif - #if defined(LIBXML_XPATH_ENABLED) - php_info_print_table_row(2, "XPath Support", "enabled"); - #endif - #if defined(LIBXML_XPTR_ENABLED) - php_info_print_table_row(2, "XPointer Support", "enabled"); - #endif -+#if HAVE_DOMXSLT -+ php_info_print_table_row(2, "DOM/XSLT", "enabled"); -+ php_info_print_table_row(2, "libxslt Version", LIBXSLT_DOTTED_VERSION); -+#if HAVE_DOMEXSLT -+ php_info_print_table_row(2, "DOM/EXSLT", "enabled"); -+ php_info_print_table_row(2, "libexslt Version", LIBEXSLT_DOTTED_VERSION); -+#endif -+#endif -+ - php_info_print_table_end(); - } - -@@ -1318,13 +1530,13 @@ PHP_FUNCTION(domxml_is_blank_node) - PHP_FUNCTION(domxml_node_type) - { - zval *id; -- xmlNode *n; -+ xmlNode *node; - -- DOMXML_GET_THIS_OBJ(n, id, le_domxmlnodep); -+ DOMXML_GET_THIS_OBJ(node, id, le_domxmlnodep); - - DOMXML_NO_ARGS(); - -- RETURN_LONG(Z_TYPE_P(n)); -+ RETURN_LONG(node->type); - } - /* }}} */ - -@@ -1533,7 +1745,7 @@ PHP_FUNCTION(domxml_node_parent) - int ret; - - DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); -- -+ - DOMXML_NO_ARGS(); - - last = nodep->parent; -@@ -1558,7 +1770,7 @@ PHP_FUNCTION(domxml_node_children) - /* Even if the nodep is a XML_DOCUMENT_NODE the type is at the - same position. - */ -- if (Z_TYPE_P(nodep) == XML_DOCUMENT_NODE) -+ if ((Z_TYPE_P(nodep) == XML_DOCUMENT_NODE) || (Z_TYPE_P(nodep) == XML_HTML_DOCUMENT_NODE)) - last = ((xmlDoc *) nodep)->children; - else - last = nodep->children; -@@ -1579,32 +1791,27 @@ PHP_FUNCTION(domxml_node_children) - } - /* }}} */ - --/* {{{ proto object domxml_node_unlink_node(void) -- Deletes node */ -+/* {{{ proto void domxml_node_unlink_node([object node]) -+ Deletes the node */ - PHP_FUNCTION(domxml_node_unlink_node) - { - zval *id; - xmlNode *nodep; - -- DOMXML_NO_ARGS(); -- -- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); -- -- DOMXML_NO_ARGS(); -+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep); - - xmlUnlinkNode(nodep); - xmlFreeNode(nodep); - zval_dtor(id); /* This is not enough because the children won't be deleted */ -- RETURN_TRUE; - } - /* }}} */ - --/* {{{ proto object domxml_node_add_child(int domnode) -+/* {{{ proto object domxml_node_add_child(object domnode) - Adds existing node to parent node */ - PHP_FUNCTION(domxml_node_add_child) - { - zval *id, *rv, *node; -- xmlNodePtr child, nodep; -+ xmlNodePtr child, nodep, new_child; - int ret; - - DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); -@@ -1615,10 +1822,20 @@ PHP_FUNCTION(domxml_node_add_child) - - DOMXML_GET_OBJ(child, node, le_domxmlnodep); - -- child = xmlAddChild(nodep, child); -+ if (child->type == XML_ATTRIBUTE_NODE) { -+ php_error(E_WARNING, "%s(): can't add attribute node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ if (NULL == (new_child = xmlCopyNode(child, 1))) { -+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ child = xmlAddChild(nodep, new_child); - - if (NULL == child) { -- php_error(E_WARNING, "%s() couldn't add child", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): couldn't add child", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } - -@@ -1626,12 +1843,39 @@ PHP_FUNCTION(domxml_node_add_child) - } - /* }}} */ - --/* {{{ proto object domxml_node_append_child(int domnode) -+/* {{{ proto object domxml_node_replace_node(object domnode) -+ Replaces one node with another node */ -+PHP_FUNCTION(domxml_node_replace_node) -+{ -+ zval *id, *rv, *node; -+ xmlNodePtr repnode, nodep, new_repnode; -+ int ret; -+ -+ DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &node) == FAILURE) { -+ return; -+ } -+ -+ DOMXML_GET_OBJ(repnode, node, le_domxmlnodep); -+ -+ if (NULL == (new_repnode = xmlCopyNode(repnode, 1))) { -+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ repnode = xmlReplaceNode(nodep, new_repnode); -+ -+ DOMXML_RET_OBJ(rv, repnode, &ret); -+} -+/* }}} */ -+ -+/* {{{ proto object domxml_node_append_child(object domnode) - Adds node to list of children */ - PHP_FUNCTION(domxml_node_append_child) - { - zval *id, *rv, *node; -- xmlNodePtr child, nodep; -+ xmlNodePtr child, nodep, new_child; - int ret; - - DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); -@@ -1642,11 +1886,21 @@ PHP_FUNCTION(domxml_node_append_child) - - DOMXML_GET_OBJ(child, node, le_domxmlnodep); - -+ if (child->type == XML_ATTRIBUTE_NODE) { -+ php_error(E_WARNING, "%s(): can't append attribute node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ if (NULL == (new_child = xmlCopyNode(child, 1))) { -+ php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ - // FIXME reverted xmlAddChildList; crashes -- child = xmlAddSibling(nodep, child); -+ child = xmlAddSibling(nodep, new_child); - - if (NULL == child) { -- php_error(E_WARNING, "%s() couldn't add node", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): couldn't append node", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } - -@@ -1654,7 +1908,7 @@ PHP_FUNCTION(domxml_node_append_child) - } - /* }}} */ - --/* {{{ proto object domxml_node_insert_before(int newnode, int refnode) -+/* {{{ proto object domxml_node_insert_before(object newnode, object refnode) - Adds node in list of nodes before given node */ - PHP_FUNCTION(domxml_node_insert_before) - { -@@ -1674,7 +1928,7 @@ PHP_FUNCTION(domxml_node_insert_before) - child = xmlAddPrevSibling(refp, child); - - if (NULL == child) { -- php_error(E_WARNING, "%s() couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): couldn't add newnode as the previous sibling of refnode", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } - -@@ -1783,11 +2037,35 @@ PHP_FUNCTION(domxml_node_set_content) - /* FIXME: Actually the property 'content' of the node has to be updated - as well. Since 'content' should disappear sooner or later and being - replaces by a function 'content()' I skip this for now -- */ -+ */ - RETURN_TRUE; - } - /* }}} */ - -+/* {{{ proto string domxml_node_get_content() -+ Gets content of a node. -+ -+ "Read the value of a node, this can be either the text carried directly by -+this node if it's a TEXT node or the aggregate string of the values carried by -+this node child's (TEXT and ENTITY_REF). Entity references are substituted." -+ */ -+PHP_FUNCTION(domxml_node_get_content) -+{ -+ zval *id; -+ xmlNode *nodep; -+ xmlChar *mem; -+ -+ DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep); -+ mem = xmlNodeGetContent(nodep); -+ if (!mem) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_STRING(mem,1); -+} -+/* }}} */ -+ -+ - /* End of Methods DomNode }}} */ - - -@@ -1902,7 +2180,7 @@ PHP_FUNCTION(domxml_elem_set_attribute) - - attr = xmlSetProp(nodep, name, value); - if (!attr) { -- php_error(E_WARNING, "%s() no such attribute '%s'", get_active_function_name(TSRMLS_C), name); -+ php_error(E_WARNING, "%s(): no such attribute '%s'", get_active_function_name(TSRMLS_C), name); - RETURN_FALSE; - } - -@@ -1966,7 +2244,7 @@ PHP_FUNCTION(domxml_elem_set_attribute_n - xmlAttr *attrp; - - DOMXML_NOT_IMPLEMENTED(); -- -+ - if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) { - id = getThis(); - nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC); -@@ -2052,8 +2330,8 @@ PHP_FUNCTION(domxml_doc_doctype) - Returns DomeDOMImplementation */ - PHP_FUNCTION(domxml_doc_implementation) - { -- zval *id; -- xmlDocPtr docp; -+/* zval *id; -+ xmlDocPtr docp;*/ - - DOMXML_NOT_IMPLEMENTED(); - -@@ -2283,7 +2561,7 @@ PHP_FUNCTION(domxml_doc_create_processin - } - /* }}} */ - --/* {{{ proto object domxml_doc_imported_node(int node, bool recursive) -+/* {{{ proto object domxml_doc_imported_node(object node, bool recursive) - Creates new element node */ - PHP_FUNCTION(domxml_doc_imported_node) - { -@@ -2311,7 +2589,7 @@ PHP_FUNCTION(domxml_doc_imported_node) - } - /* }}} */ - --/* {{{ proto object domxml_dtd([int doc_handle]) -+/* {{{ proto object domxml_dtd(void) - Returns DTD of document */ - PHP_FUNCTION(domxml_intdtd) - { -@@ -2331,9 +2609,9 @@ PHP_FUNCTION(domxml_intdtd) - } - /* }}} */ - --/* {{{ proto string domxml_dumpmem([int doc_handle]) -+/* {{{ proto string domxml_dump_mem([object doc_handle]) - Dumps document into string */ --PHP_FUNCTION(domxml_dumpmem) -+PHP_FUNCTION(domxml_dump_mem) - { - zval *id; - xmlDoc *docp; -@@ -2341,7 +2619,6 @@ PHP_FUNCTION(domxml_dumpmem) - int size; - - DOMXML_PARAM_NONE(docp, id, le_domxmldocp); -- - xmlDocDumpMemory(docp, &mem, &size); - if (!size) { - RETURN_FALSE; -@@ -2350,6 +2627,73 @@ PHP_FUNCTION(domxml_dumpmem) - } - /* }}} */ - -+/* {{{ proto int domxml_dump_mem_file([object doc_handle],filename,compressmode) -+ Dumps document into file and uses compression if specified -+ Returns false on error, otherwise the length of the xml-document (uncompressed) -+ */ -+PHP_FUNCTION(domxml_dump_mem_file) -+{ -+ zval *id; -+ xmlDoc *docp; -+ int file_len, bytes; -+ int compressmode = 0; -+ char *file; -+ DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "s|l", &file, &file_len, &compressmode); -+ -+ xmlSetCompressMode (compressmode); -+ bytes = xmlSaveFile(file,docp); -+ if (bytes == -1) -+ { -+ RETURN_FALSE; -+ } -+ RETURN_LONG(bytes); -+} -+/* }}} */ -+ -+/* {{{ proto string domxml_dump_node([object doc_handle],object node_handle[,int format[,int level]]) -+ Dumps node into string */ -+PHP_FUNCTION(domxml_dump_node) -+{ -+ zval *id, *nodep; -+ xmlDocPtr docp; -+ xmlNodePtr elementp; -+ xmlChar *mem ; -+ xmlBufferPtr buf; -+ int level = 0; -+ int format = 0; -+ -+ DOMXML_PARAM_THREE(docp, id, le_domxmldocp,"o|ll",&nodep,&format,&level); -+ -+ DOMXML_GET_OBJ(elementp, nodep, le_domxmlnodep); -+ -+ if (Z_TYPE_P(elementp) == XML_DOCUMENT_NODE || Z_TYPE_P(elementp) == XML_HTML_DOCUMENT_NODE ) { -+ php_error(E_WARNING, "%s(): cannot dump element with a document node", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ buf = xmlBufferCreate(); -+ if (!buf) -+ { -+ php_error(E_WARNING, "%s(): could fetch buffer", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ xmlNodeDump(buf, docp, elementp,level,format); -+ -+ mem = (xmlChar*) xmlBufferContent(buf); -+ -+ if (!mem) { -+ xmlBufferFree(buf); -+ RETURN_FALSE; -+ } -+ RETVAL_STRING(mem, 1); -+ -+ xmlBufferFree(buf); -+ -+} -+/* }}} */ -+ -+ - /* {{{ proto object xmldoc(string xmldoc [, bool from_file]) - Creates DOM object of XML document */ - PHP_FUNCTION(xmldoc) -@@ -2413,6 +2757,106 @@ PHP_FUNCTION(xmldocfile) - } - /* }}} */ - -+#if defined(LIBXML_HTML_ENABLED) -+/* {{{ proto string domxml_html_dump_mem([int doc_handle]) -+ Dumps document into string as HTML */ -+PHP_FUNCTION(domxml_html_dump_mem) -+{ -+ zval *id; -+ xmlDoc *docp; -+ xmlChar *mem; -+ int size; -+ -+ DOMXML_PARAM_NONE(docp, id, le_domxmldocp); -+ -+ htmlDocDumpMemory(docp, &mem, &size); -+ if (!size) { -+ RETURN_FALSE; -+ } -+ RETURN_STRINGL(mem, size, 1); -+} -+/* }}} */ -+ -+/* {{{ proto object html_doc(string html_doc [, bool from_file]) -+ Creates DOM object of HTML document */ -+PHP_FUNCTION(html_doc) -+{ -+ zval *rv; -+ xmlDoc *docp; -+ int ret; -+ char *buffer; -+ int buffer_len; -+ zend_bool from_file = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &buffer, &buffer_len, &from_file) == FAILURE) { -+ return; -+ } -+ -+ if (from_file) { -+ docp = htmlParseFile(buffer, NULL); -+ } else { -+ docp = htmlParseDoc(buffer, NULL); -+ } -+ if (!docp) -+ RETURN_FALSE; -+ -+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret); -+} -+/* }}} */ -+ -+/* {{{ proto object html_doc_file(string filename) -+ Creates DOM object of HTML document in file */ -+PHP_FUNCTION(html_doc_file) -+{ -+ zval *rv; -+ xmlDoc *docp; -+ int ret, file_len; -+ char *file; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) { -+ return; -+ } -+ -+ docp = htmlParseFile(file, NULL); -+ if (!docp) { -+ RETURN_FALSE; -+ } -+ -+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret); -+ -+ add_property_resource(return_value, "doc", ret); -+ if (docp->name) -+ add_property_stringl(return_value, "name", (char *) docp->name, strlen(docp->name), 1); -+ if (docp->URL) -+ add_property_stringl(return_value, "url", (char *) docp->URL, strlen(docp->URL), 1); -+ if (docp->version) -+ add_property_stringl(return_value, "version", (char *) docp->version, strlen(docp->version), 1); -+/* add_property_stringl(return_value, "version", (char *) docp->version, strlen(docp->version), 1);*/ -+ if (docp->encoding) -+ add_property_stringl(return_value, "encoding", (char *) docp->encoding, strlen(docp->encoding), 1); -+ add_property_long(return_value, "standalone", docp->standalone); -+ add_property_long(return_value, "type", Z_TYPE_P(docp)); -+ add_property_long(return_value, "compression", docp->compression); -+ add_property_long(return_value, "charset", docp->charset); -+ zend_list_addref(ret); -+} -+/* }}} */ -+#endif /* defined(LIBXML_HTML_ENABLED) */ -+ -+/* {{{ proto bool domxml_substitute_entities_default(bool enable) -+ Set and return the previous value for default entity support */ -+PHP_FUNCTION(domxml_substitute_entities_default) -+{ -+ zend_bool enable; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &enable) == FAILURE) { -+ return; -+ } -+ -+ RETURN_BOOL(xmlSubstituteEntitiesDefault(enable)); -+} -+/* }}} */ -+ - /* {{{ proto bool domxml_node_text_concat(string content) - Add string tocontent of a node */ - PHP_FUNCTION(domxml_node_text_concat) -@@ -2421,7 +2865,7 @@ PHP_FUNCTION(domxml_node_text_concat) - xmlNode *nodep; - char *content; - int content_len; -- -+ - DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep); - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &content, &content_len) == FAILURE) { -@@ -2589,7 +3033,7 @@ static int node_children(zval **children - - /* Get the namespace of the current node and add it as a property */ - /* XXX FIXME XXX */ --/* -+/* - if(!node_namespace(&namespace, last)) - zend_hash_update(Z_OBJPROP_P(child), "namespace", sizeof("namespace"), (void *) &namespace, sizeof(zval *), NULL); - */ -@@ -2619,7 +3063,7 @@ PHP_FUNCTION(xmltree) - xmlNode *root; - int ret, buf_len; - char *buf; -- -+ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) { - return; - } -@@ -2690,7 +3134,7 @@ static void php_xpathptr_new_context(INT - } - /* }}} */ - --/* {{{ proto string xpath_new_context([int doc_handle]) -+/* {{{ proto object xpath_new_context([int doc_handle]) - Creates new XPath context */ - PHP_FUNCTION(xpath_new_context) - { -@@ -2698,7 +3142,7 @@ PHP_FUNCTION(xpath_new_context) - } - /* }}} */ - --/* {{{ proto string xptr_new_context([int doc_handle]) -+/* {{{ proto object xptr_new_context([int doc_handle]) - Creates new XPath context */ - PHP_FUNCTION(xptr_new_context) - { -@@ -2731,10 +3175,10 @@ static void php_xpathptr_eval(INTERNAL_F - } - - ctxp = php_xpath_get_context(id, le_xpathctxp, 0 TSRMLS_CC); -- if (!ctxp) { -- php_error(E_WARNING, "%s() cannot fetch XPATH context", get_active_function_name(TSRMLS_C)); -- RETURN_FALSE; -- } -+ if (!ctxp) { -+ php_error(E_WARNING, "%s(): cannot fetch XPATH context", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } - - if (contextnode) { - DOMXML_GET_OBJ(contextnodep, contextnode, le_domxmlnodep); -@@ -2761,7 +3205,7 @@ static void php_xpathptr_eval(INTERNAL_F - } - - if (NULL == (rv = php_xpathobject_new(xpathobjp, &ret TSRMLS_CC))) { -- php_error(E_WARNING, "%s() cannot create required XPATH objcet", get_active_function_name(TSRMLS_C)); -+ php_error(E_WARNING, "%s(): cannot create required XPATH objcet", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } - SEPARATE_ZVAL(&rv); -@@ -2836,7 +3280,7 @@ static void php_xpathptr_eval(INTERNAL_F - } - /* }}} */ - --/* {{{ proto int xpath_eval([int xpathctx_handle,] string str) -+/* {{{ proto object xpath_eval([object xpathctx_handle,] string str) - Evaluates the XPath Location Path in the given string */ - PHP_FUNCTION(xpath_eval) - { -@@ -2844,13 +3288,46 @@ PHP_FUNCTION(xpath_eval) - } - /* }}} */ - --/* {{{ proto int xpath_eval_expression([int xpathctx_handle,] string str) -- Evaluates the XPath Location Path in the given string */ -+/* {{{ proto object xpath_eval_expression([object xpathctx_handle,] string str) -+ Evaluates the XPath expression in the given string */ - PHP_FUNCTION(xpath_eval_expression) - { - php_xpathptr_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_XPATH, 1); - } - /* }}} */ -+ -+/* {{{ proto bool xpath_register_ns([object xpathctx_handle,] string namespace_prefix, string namespace_uri) -+ Registeres the given namespace in the passed XPath context */ -+PHP_FUNCTION(xpath_register_ns) -+{ -+ /* -+ TODO: -+ - automagically register all namespaces when creating a new context -+ */ -+ -+ int prefix_len, uri_len, result; -+ xmlXPathContextPtr ctxp; -+ char *prefix, *uri, *uri_static; -+ zval *id; -+ -+ DOMXML_PARAM_FOUR(ctxp, id, le_xpathctxp, "ss", &prefix, &prefix_len, &uri, &uri_len); -+ -+ /* set the context node to NULL - what is a context node anyway? */ -+ ctxp->node = NULL; -+ -+ /* -+ this is a hack - libxml2 doesn't copy the URI, it simply uses the string -+ given in the parameter - which is normally deallocated after the function -+ */ -+ uri_static = estrndup(uri, uri_len); -+ result = xmlXPathRegisterNs(ctxp, prefix, uri_static); -+ -+ if (0 == result) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ - #endif /* defined(LIBXML_XPATH_ENABLED) */ - - #if defined(LIBXML_XPTR_ENABLED) -@@ -2864,12 +3341,266 @@ PHP_FUNCTION(xptr_eval) - #endif /* LIBXML_XPTR_ENABLED */ - - /* {{{ proto string domxml_version(void) -- Dumps document into string */ -+ Get XML library version */ - PHP_FUNCTION(domxml_version) - { - RETURN_STRING(LIBXML_DOTTED_VERSION, 1); - } - /* }}} */ -+ -+#if HAVE_DOMXSLT -+static zval *php_xsltstylesheet_new(xsltStylesheetPtr obj, int *found TSRMLS_DC) -+{ -+ zval *wrapper; -+ int rsrc_type; -+ -+ if (! found) { -+ *found = 0; -+ } -+ -+ if (!obj) { -+ MAKE_STD_ZVAL(wrapper); -+ ZVAL_NULL(wrapper); -+ return wrapper; -+ } -+ -+ if ((wrapper = (zval *) dom_object_get_data((void *) obj))) { -+ zval_add_ref(&wrapper); -+ *found = 1; -+ return wrapper; -+ } -+ -+ MAKE_STD_ZVAL(wrapper); -+ -+ object_init_ex(wrapper, domxsltstylesheet_class_entry); -+ rsrc_type = le_domxsltstylesheetp; -+ php_xsltstylesheet_set_object(wrapper, (void *) obj, rsrc_type); -+ -+ return (wrapper); -+} -+ -+/* {{{ proto object domxml_xslt_stylesheet(string xsltstylesheet) -+ Creates XSLT Stylesheet object from string */ -+PHP_FUNCTION(domxml_xslt_stylesheet) -+{ -+ zval *rv; -+ xmlDocPtr docp; -+ xsltStylesheetPtr sheetp; -+ int ret; -+ char *buffer; -+ int buffer_len; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buffer, &buffer_len) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ docp = xmlParseDoc(buffer); -+ -+ if (!docp) -+ RETURN_FALSE; -+ -+ sheetp = xsltParseStylesheetDoc(docp); -+ -+ if (!sheetp) -+ RETURN_FALSE; -+ -+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC); -+ DOMXML_RET_ZVAL(rv); -+} -+/* }}} */ -+ -+/* {{{ proto object domxml_xslt_stylesheet_doc(object xmldoc) -+ Creates XSLT Stylesheet object from DOM Document object */ -+PHP_FUNCTION(domxml_xslt_stylesheet_doc) -+{ -+ zval *rv, *idxml; -+ xmlDocPtr docp; -+ xmlDocPtr newdocp; -+ xsltStylesheetPtr sheetp; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &idxml) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ DOMXML_GET_OBJ(docp, idxml, le_domxmldocp); -+ -+ newdocp = xmlCopyDoc(docp, 1); -+ -+ if (!newdocp) -+ RETURN_FALSE; -+ -+ sheetp = xsltParseStylesheetDoc(newdocp); -+ -+ if (!sheetp) -+ RETURN_FALSE; -+ -+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC); -+ DOMXML_RET_ZVAL(rv); -+} -+/* }}} */ -+ -+/* {{{ proto object domxml_xslt_stylesheet_file(string filename) -+ Creates XSLT Stylesheet object from file */ -+PHP_FUNCTION(domxml_xslt_stylesheet_file) -+{ -+ zval *rv; -+ xsltStylesheetPtr sheetp; -+ int ret, file_len; -+ char *file; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ sheetp = xsltParseStylesheetFile(file); -+ -+ if (!sheetp) -+ RETURN_FALSE; -+ -+ rv = php_xsltstylesheet_new(sheetp, &ret TSRMLS_CC); -+ DOMXML_RET_ZVAL(rv); -+} -+/* }}} */ -+ -+/* {{{ php_domxslt_string_to_xpathexpr() -+ Translates a string to a XPath Expression */ -+static char *php_domxslt_string_to_xpathexpr(const char *str) -+{ -+ const xmlChar *string = (const xmlChar *)str; -+ -+ xmlChar *value; -+ -+ TSRMLS_FETCH(); -+ -+ if (xmlStrchr(string, '"')) { -+ if (xmlStrchr(string, '\'')) { -+ php_error(E_WARNING, "Cannot create XPath expression (string contains both quote and double-quotes) in %s", -+ get_active_function_name(TSRMLS_C)); -+ return NULL; -+ } -+ value = xmlStrdup((const xmlChar *)"'"); -+ value = xmlStrcat(value, string); -+ value = xmlStrcat(value, (const xmlChar *)"'"); -+ } -+ else { -+ value = xmlStrdup((const xmlChar *)"\""); -+ value = xmlStrcat(value, string); -+ value = xmlStrcat(value, (const xmlChar *)"\""); -+ } -+ -+ return (char *)value; -+} -+ -+/* {{{ php_domxslt_make_params() -+ Translates a PHP array to a libxslt parameters array */ -+static char **php_domxslt_make_params(zval *idvars, int xpath_params) -+{ -+ HashTable *parht; -+ int parsize; -+ zval **value; -+ char *xpath_expr, *string_key = NULL; -+ ulong num_key; -+ char **params = NULL; -+ int i = 0; -+ -+ TSRMLS_FETCH(); -+ -+ parht = HASH_OF(idvars); -+ parsize = (2 * zend_hash_num_elements(parht) + 1) * sizeof(char *); -+ params = (char **)emalloc(parsize); -+ memset((char *)params, 0, parsize); -+ -+ for (zend_hash_internal_pointer_reset(parht); -+ zend_hash_get_current_data(parht, (void **)&value) == SUCCESS; -+ zend_hash_move_forward(parht)) { -+ -+ if (zend_hash_get_current_key(parht, &string_key, &num_key, 1) != HASH_KEY_IS_STRING) { -+ php_error(E_WARNING, "Invalid argument or parameter array to %s", -+ get_active_function_name(TSRMLS_C)); -+ return NULL; -+ } -+ else { -+ SEPARATE_ZVAL(value); -+ convert_to_string_ex(value); -+ -+ if (!xpath_params) { -+ xpath_expr = php_domxslt_string_to_xpathexpr(Z_STRVAL_PP(value)); -+ } -+ else { -+ xpath_expr = Z_STRVAL_PP(value); -+ } -+ -+ if (xpath_expr) { -+ params[i++] = string_key; -+ params[i++] = xpath_expr; -+ } -+ } -+ } -+ -+ params[i++] = NULL; -+ -+ return params; -+} -+ -+/* {{{ proto object domxml_xslt_process(object xslstylesheet, object xmldoc [, array xslt_parameters [, bool xpath_parameters]]) -+ Perform an XSLT transformation */ -+PHP_FUNCTION(domxml_xslt_process) -+{ -+/* TODO: -+ - test memory deallocation -+ - test other stuff -+ - check xsltsp->errors ??? -+*/ -+ zval *rv, *idxsl, *idxml, *idparams = NULL; -+ zend_bool xpath_params = 0; -+ xsltStylesheetPtr xsltstp; -+ xmlDocPtr xmldocp; -+ xmlDocPtr docp; -+ char **params = NULL; -+ int ret; -+ -+ DOMXML_GET_THIS(idxsl); -+ -+ xsltstp = php_xsltstylesheet_get_object(idxsl, le_domxsltstylesheetp, 0 TSRMLS_CC); -+ if (!xsltstp) { -+ php_error(E_WARNING, "%s(): underlying object missing", -+ get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o|ab", &idxml, &idparams, &xpath_params) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ DOMXML_GET_OBJ(xmldocp, idxml, le_domxmldocp); -+ -+ if (idparams) { -+ params = php_domxslt_make_params(idparams, xpath_params); -+ } -+ -+ docp = xsltApplyStylesheet(xsltstp, xmldocp, (const char**)params); -+ -+ if (params) { -+ efree(params); -+ } -+ -+ if (!docp) { -+ RETURN_FALSE; -+ } -+ -+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret); -+} -+/* }}} */ -+ -+/* {{{ proto string domxml_xslt_version(void) -+ Get XSLT library version */ -+PHP_FUNCTION(domxml_xslt_version) -+{ -+ RETURN_STRING(LIBXSLT_DOTTED_VERSION, 1); -+} -+/* }}} */ -+#endif /* HAVE_DOMXSLT */ - - #endif /* HAVE_DOMXML */ - -diff -upr php-4.1.2/ext/domxml/php_domxml.h php-4.1.2-dom-xslt/ext/domxml/php_domxml.h ---- php-4.1.2/ext/domxml/php_domxml.h Fri Dec 14 11:45:46 2001 -+++ php-4.1.2-dom-xslt/ext/domxml/php_domxml.h Tue Jan 22 00:21:32 2002 -@@ -16,19 +16,36 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id$ */ -+/* $Id$ */ - - #ifndef PHP_DOMXML_H - #define PHP_DOMXML_H - - #if HAVE_DOMXML - #include -+#include -+#include -+#if defined(LIBXML_HTML_ENABLED) -+#include -+#include -+#endif - #if defined(LIBXML_XPATH_ENABLED) - #include -+#include - #endif - #if defined(LIBXML_XPTR_ENABLED) - #include - #endif -+#if HAVE_DOMXSLT -+#include -+#include -+#include -+#include -+#if HAVE_DOMEXSLT -+#include -+#include -+#endif -+#endif - - extern zend_module_entry domxml_module_entry; - #define domxml_module_ptr &domxml_module_entry -@@ -40,8 +57,13 @@ PHP_MINFO_FUNCTION(domxml); - PHP_FUNCTION(domxml_version); - PHP_FUNCTION(xmldoc); - PHP_FUNCTION(xmldocfile); -+#if defined(LIBXML_HTML_ENABLED) -+PHP_FUNCTION(html_doc); -+PHP_FUNCTION(html_doc_file); -+#endif - PHP_FUNCTION(xmltree); - PHP_FUNCTION(domxml_new_xmldoc); -+PHP_FUNCTION(domxml_substitute_entities_default); - - /* Class Document methods */ - PHP_FUNCTION(domxml_doc_doctype); -@@ -57,7 +79,13 @@ PHP_FUNCTION(domxml_doc_create_entity_re - PHP_FUNCTION(domxml_doc_imported_node); - PHP_FUNCTION(domxml_add_root); - PHP_FUNCTION(domxml_intdtd); --PHP_FUNCTION(domxml_dumpmem); -+PHP_FUNCTION(domxml_dump_mem); -+PHP_FUNCTION(domxml_dump_mem_file); -+PHP_FUNCTION(domxml_dump_node); -+ -+#if defined(LIBXML_HTML_ENABLED) -+PHP_FUNCTION(domxml_html_dump_mem); -+#endif - - /* Class DocumentType methods */ - PHP_FUNCTION(domxml_doctype_name); -@@ -89,8 +117,10 @@ PHP_FUNCTION(domxml_node_prefix); - PHP_FUNCTION(domxml_node); - PHP_FUNCTION(domxml_clone_node); - PHP_FUNCTION(domxml_node_unlink_node); -+PHP_FUNCTION(domxml_node_replace_node); - PHP_FUNCTION(domxml_node_new_child); - PHP_FUNCTION(domxml_node_set_content); -+PHP_FUNCTION(domxml_node_get_content); - PHP_FUNCTION(domxml_node_text_concat); - PHP_FUNCTION(domxml_node_set_name); - PHP_FUNCTION(domxml_node_name); -@@ -135,12 +165,22 @@ PHP_FUNCTION(xpath_init); - PHP_FUNCTION(xpath_new_context); - PHP_FUNCTION(xpath_eval); - PHP_FUNCTION(xpath_eval_expression); -+PHP_FUNCTION(xpath_register_ns); - #endif - #if defined(LIBXML_XPTR_ENABLED) - PHP_FUNCTION(xptr_new_context); - PHP_FUNCTION(xptr_eval); - #endif - PHP_FUNCTION(domxml_test); -+ -+/* DOMXSLT functions */ -+#if HAVE_DOMXSLT -+PHP_FUNCTION(domxml_xslt_stylesheet); -+PHP_FUNCTION(domxml_xslt_stylesheet_doc); -+PHP_FUNCTION(domxml_xslt_stylesheet_file); -+PHP_FUNCTION(domxml_xslt_process); -+PHP_FUNCTION(domxml_xslt_version); -+#endif - - #else - #define domxml_module_ptr NULL diff --git a/php-ZVAL.patch b/php-ZVAL.patch deleted file mode 100644 index 8a4a331..0000000 --- a/php-ZVAL.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -u -r1.87 zend_API.h ---- php-4.0.6.orig/Zend/zend_API.h 2001/04/19 17:51:23 -+++ php-4.0.6/Zend/zend_API.h 2001/08/24 13:18:51 -@@ -268,8 +268,8 @@ - (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 ZVAL_FALSE(z) { (z)->value.lval = 0; (z)->type = IS_BOOL; } -+#define ZVAL_TRUE(z) { (z)->value.lval = 1; (z)->type = IS_BOOL; } - - #define RETVAL_RESOURCE(l) { \ - return_value->type = IS_RESOURCE;\ diff --git a/php-ac250.patch b/php-ac250.patch deleted file mode 100644 index 68411c5..0000000 --- a/php-ac250.patch +++ /dev/null @@ -1,248 +0,0 @@ ---- php-4.0.6/ext/pdf/config.m4.wiget Thu Jun 14 06:35:44 2001 -+++ php-4.0.6/ext/pdf/config.m4 Fri Jul 6 08:37:53 2001 -@@ -18,7 +18,7 @@ - AC_CHECK_LIB(pdf, PDF_show_boxed, [ - AC_DEFINE(HAVE_PDFLIB,1,[ ]) - ],[ -- AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir= and --with-jpeg-dir=) -+ AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir= and --with-jpeg-dir=]) - ],[ - -ltiff -ljpeg -lpng -lz - ]) -@@ -34,7 +34,7 @@ - if test -n "$PDFLIB_INCLUDE" ; then - - if test "$PHP_ZLIB_DIR" = "no"; then -- AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=) -+ AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=]) - fi - - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) -@@ -47,7 +47,7 @@ - [ - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_ERROR(libjpeg not found!) -+ AC_MSG_ERROR([libjpeg not found!]) - ],[ - -L$PHP_JPEG_DIR/lib - ]) -@@ -56,12 +56,12 @@ - [ - PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_RESULT(no, try --with-jpeg-dir=) -+ AC_MSG_RESULT([no, try --with-jpeg-dir=]) - ]) - fi - - -- PHP_ARG_WITH(png-dir, for the location of libpng, -+ PHP_ARG_WITH(png-dir,[ for the location of libpng], - [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) - - if test "$PHP_PNG_DIR" != "no"; then -@@ -69,7 +69,7 @@ - [ - PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_ERROR(libpng not found!) -+ AC_MSG_ERROR([libpng not found!]) - ],[ - -L$PHP_PNG_DIR/lib - ]) -@@ -78,12 +78,12 @@ - [ - PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_RESULT(no, try --with-png-dir=) -+ AC_MSG_RESULT([no, try --with-png-dir=]) - ]) - fi - - -- PHP_ARG_WITH(tiff-dir, for the location of libtiff, -+ PHP_ARG_WITH(tiff-dir,[ for the location of libtiff], - [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory]) - - if test "$PHP_TIFF_DIR" != "no"; then -@@ -91,7 +91,7 @@ - [ - PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_ERROR(libtiff not found!) -+ AC_MSG_ERROR([libtiff not found!]) - ],[ - -L$PHP_TIFF_DIR/lib - ]) -@@ -100,7 +100,7 @@ - [ - PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) - ],[ -- AC_MSG_RESULT(no, Try --with-tiff-dir=) -+ AC_MSG_RESULT([no, Try --with-tiff-dir=]) - ]) - fi - -@@ -111,7 +111,7 @@ - PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDFLIB_INCLUDE) - ],[ -- AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.) -+ AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x.]) - ],[ - -L$PHP_PDFLIB/lib - ]) ---- php-4.0.6/ext/yp/config.m4.wiget Fri Jul 6 08:37:53 2001 -+++ php-4.0.6/ext/yp/config.m4 Fri Jul 6 08:37:53 2001 -@@ -2,13 +2,15 @@ - dnl config.m4 for extension yp - dnl don't forget to call PHP_EXTENSION(yp) - --PHP_ARG_ENABLE(yp,whether to include YP support, -+PHP_ARG_ENABLE(yp,[whether to include YP support], - [ --enable-yp Include YP support]) - - if test "$PHP_YP" != "no"; then - PHP_SUBST(NSL_SHARED_LIBADD) -- AC_ADD_LIBRARY_WITH_PATH(nsl, /usr/lib, NSL_SHARED_LIBADD) -- AC_CHECK_LIB(nsl, yp_match, [AC_DEFINE(HAVE_YP,1,[ ])], [AC_MSG_ERROR(YP module requires libnsl)],) -+ AC_CHECK_LIB(nsl, yp_match, [ -+ AC_DEFINE(HAVE_YP,1,[ ]) -+ PHP_ADD_LIBRARY(nsl,, NSL_SHARED_LIBADD) -+ ], [AC_MSG_ERROR([YP module requires libnsl])]) - PHP_EXTENSION(yp, $ext_shared) - - case "$host_alias" in ---- php-4.1.1/acinclude.m4.wiget Sun Jun 10 21:52:56 2001 -+++ php-4.1.1/acinclude.m4 Fri Jul 6 09:26:10 2001 -@@ -351,7 +351,7 @@ - AC_SUBST($1) - ]) - --AC_DEFUN(PHP_FAST_OUTPUT,[ -+AC_DEFUN([PHP_FAST_OUTPUT],[ - PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1" - ]) - -@@ -377,7 +377,7 @@ - done - ]) - --AC_DEFUN(PHP_GEN_MAKEFILES,[ -+AC_DEFUN([PHP_GEN_MAKEFILES],[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1 - ]) - -@@ -914,6 +908,7 @@ - dnl ## This macro can be used several times. - AC_DEFUN(PHP_OUTPUT,[ - PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1" -+ AC_CONFIG_FILES($1) - ]) - - AC_DEFUN(PHP_DECLARED_TIMEZONE,[ ---- php-4.0.6/configure.in.wiget Fri Jul 6 08:37:53 2001 -+++ php-4.0.6/configure.in Fri Jul 6 09:32:15 2001 -@@ -5,7 +5,7 @@ - - AC_INIT(README.CVS-RULES) - --PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile) -+PHP_FAST_OUTPUT([sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile]) - - if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then - AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS) -@@ -117,10 +117,7 @@ - AC_PROG_CC_C_O - AC_PROG_LN_S - --AM_PROG_LEX --if test -n "$LEX"; then -- AC_DECL_YYTEXT --fi -+AC_PROG_LEX() - - dnl ## Make flex scanners use const if they can, even if __STDC__ is not - dnl ## true, for compilers like Sun's that only set __STDC__ true in -@@ -225,12 +222,12 @@ - - unset ac_cv_func_yp_get_default_domain - AC_CHECK_FUNC(yp_get_default_domain, -- [php_no_nsl_checks=yes],[ ]) -+ [php_no_nsl_checks=yes],[true ]) - unset ac_cv_func_yp_get_default_domain - - if test "$php_no_nsl_checks" != "yes"; then - --AC_CHECK_FUNC(gethostname, [ ], [ -+AC_CHECK_FUNC(gethostname, [true ], [ - AC_CHECK_LIB(nsl, gethostname, [ - PHP_ADD_LIBRARY(nsl) - AC_DEFINE(HAVE_LIBNSL,1,[ ]) ],[ -@@ -250,8 +247,8 @@ - - dnl Only include libbind if inet_aton is not found in - dnl libresolv. --AC_CHECK_LIB(resolv, inet_aton, [], [ -- AC_CHECK_LIB(bind, inet_aton, [], [ -+AC_CHECK_LIB(resolv, inet_aton, [true], [ -+ AC_CHECK_LIB(bind, inet_aton, [true], [ - AC_CHECK_LIB(bind, __inet_aton) - ]) - ]) -@@ -870,6 +867,12 @@ - PHP_SUBST(TSRM_LIB) - PHP_SUBST(WARNING_LEVEL) - PHP_SUBST_OLD(YACC) -+PHP_SUBST(EXT_SUBDIRS) -+PHP_SUBST(EXT_STATIC) -+PHP_SUBST(EXT_SHARED) -+PHP_SUBST(EXT_LIBS) -+PHP_SUBST(EXT_LTLIBS) -+ - - PHP_CONFIGURE_PART(Configuring libtool) - -@@ -936,14 +939,17 @@ - pear/scripts/pear pear/scripts/phpize pear/scripts/php-config \ - TSRM/Makefile $PHP_OUTPUT_FILES" - --AC_OUTPUT($ALL_OUTPUT_FILES, [], [ -+AC_CONFIG_FILES([php4.spec Zend/Makefile main/build-defs.h -+ pear/scripts/pear pear/scripts/phpize pear/scripts/php-config -+ TSRM/Makefile]) -+AC_CONFIG_COMMANDS([default], [true], [ - --if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then -+dnl if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then - REDO_ALL=yes --fi -+dnl fi - - if test -n "\$REDO_ALL"; then -- PHP_GEN_MAKEFILES($PHP_FAST_OUTPUT_FILES) -+ PHP_GEN_MAKEFILES([$PHP_FAST_OUTPUT_FILES]) - fi - - if test ! -f $srcdir/ext/bcmath/number.c; then -@@ -1057,6 +1063,8 @@ - fi - ]) - -+AC_OUTPUT -+ - dnl ## Local Variables: - dnl ## tab-width: 4 - dnl ## End: ---- php-4.1.1/ext/imap/config.m4.orig Tue Aug 7 18:18:04 2001 -+++ php-4.1.1/ext/imap/config.m4 Sat Jan 19 13:50:24 2002 -@@ -133,7 +133,7 @@ - #endif - ],[ - AC_DEFINE(HAVE_IMAP2001, 1, [ ]) -- ],[ ]) -+ ],[:]) - CPPFLAGS=$old_CPPFLAGS - - AC_CHECK_LIB(pam, pam_start) diff --git a/php-acam.patch b/php-acam.patch deleted file mode 100644 index 5369ac7..0000000 --- a/php-acam.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-4.2.2/ext/mysql/config.m4.orig Fri Aug 9 23:49:00 2002 -+++ php-4.2.2/ext/mysql/config.m4 Sat Aug 10 00:05:40 2002 -@@ -49,6 +49,7 @@ - [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. - If unspecified, the bundled MySQL library will be used.], yes) - -+PHP_REQUIRE_CXX - if test "$PHP_MYSQL" != "no"; then - AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) - if test "$PHP_SAFE_MODE" = "yes"; then diff --git a/php-allow-db31.patch b/php-allow-db31.patch deleted file mode 100644 index e7fdac5..0000000 --- a/php-allow-db31.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- php-4.3.2/ext/dba/config.m4.orig Wed May 21 02:35:29 2003 -+++ php-4.3.2/ext/dba/config.m4 Mon Jun 23 11:53:32 2003 -@@ -176,13 +176,13 @@ - AC_MSG_CHECKING(if db can be used as shared extension) - AC_EGREP_CPP(yes,[ - #include "$THIS_INCLUDE" --#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) -+#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 0) - yes - #endif - ],[ - AC_MSG_RESULT(yes) - ],[ -- AC_MSG_ERROR(At least version 3.3 is required) -+ AC_MSG_ERROR(At least version 3.1 is required) - ]) - fi - if test -n "$THIS_LIBS"; then diff --git a/php-am_ac_lt.patch b/php-am_ac_lt.patch deleted file mode 100644 index 992d8c9..0000000 --- a/php-am_ac_lt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN php-4.1.2.org/TSRM/threads.m4 php-4.1.2/TSRM/threads.m4 ---- php-4.1.2.org/TSRM/threads.m4 Mon Apr 8 01:42:39 2002 -+++ php-4.1.2/TSRM/threads.m4 Mon Apr 8 01:43:36 2002 -@@ -32,7 +32,11 @@ - 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) -+ if test -z "$build_alias"; then -+ AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess) -+ else -+ host_alias=$build_alias -+ fi - fi - case "$host_alias" in - *solaris*) -diff -urN php-4.1.2.org/configure.in php-4.1.2/configure.in ---- php-4.1.2.org/configure.in Mon Apr 8 01:42:39 2002 -+++ php-4.1.2/configure.in Mon Apr 8 01:42:57 2002 -@@ -115,11 +115,11 @@ - - AM_PROG_CC_STDC - --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_CC_C_O - AC_PROG_LN_S - --AC_PROG_LEX -+AM_PROG_LEX - if test -n "$LEX"; then - AC_DECL_YYTEXT - fi diff --git a/php-apache.ini b/php-apache.ini deleted file mode 100644 index 3b335f6..0000000 --- a/php-apache.ini +++ /dev/null @@ -1,15 +0,0 @@ -; php-apache.ini - configuration used only for apache SAPI -; -; Please note that, unlikely in original php distributions, this file -; is read AFTER (not instead of) reading global /etc/php/php.ini. -; -; It allows you to control global settings for all SAPIs in one place -; and override some settings in SAPI-specific files without need of -; copying whole large php.ini. - -[Session] -session.save_path = /var/run/php - ; argument passed to save_handler - ; in the case of files, this is the - ; path where data files are stored - diff --git a/php-apache2.patch b/php-apache2.patch deleted file mode 100644 index 0c6aba3..0000000 --- a/php-apache2.patch +++ /dev/null @@ -1,310 +0,0 @@ -diff -urN php-4.1.2.org/sapi/apache2filter/apache_config.c php-4.1.2/sapi/apache2filter/apache_config.c ---- php-4.1.2.org/sapi/apache2filter/apache_config.c Mon Apr 8 02:40:24 2002 -+++ php-4.1.2/sapi/apache2filter/apache_config.c Wed Feb 28 15:11:34 2001 -@@ -88,7 +88,7 @@ - php_dir_entry *pe; - php_dir_entry *data; - char *str; -- uint str_len; -+ ulong str_len; - ulong num_index; - - phpapdebug((stderr, "Merge dir (%p) (%p)\n", base_conf, new_conf)); -@@ -110,7 +110,7 @@ - { - php_conf_rec *d = dummy; - char *str; -- uint str_len; -+ ulong str_len; - php_dir_entry *data; - - for (zend_hash_internal_pointer_reset(&d->config); -diff -urN php-4.1.2.org/sapi/apache2filter/php_apache.h php-4.1.2/sapi/apache2filter/php_apache.h ---- php-4.1.2.org/sapi/apache2filter/php_apache.h Mon Apr 8 02:40:24 2002 -+++ php-4.1.2/sapi/apache2filter/php_apache.h Mon Apr 8 02:34:03 2002 -@@ -1,8 +1,8 @@ - /* - +----------------------------------------------------------------------+ -- | PHP version 4.0 | -+ | PHP Version 4 | - +----------------------------------------------------------------------+ -- | Copyright (c) 1997-2001 The PHP Group | -+ | Copyright (c) 1997-2002 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 | -@@ -12,7 +12,7 @@ - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ -- | Authors: Sascha Schumann | -+ | Author: Sascha Schumann | - +----------------------------------------------------------------------+ - */ - -diff -urN php-4.1.2.org/sapi/apache2filter/php_functions.c php-4.1.2/sapi/apache2filter/php_functions.c ---- php-4.1.2.org/sapi/apache2filter/php_functions.c Mon Apr 8 02:40:24 2002 -+++ php-4.1.2/sapi/apache2filter/php_functions.c Mon Apr 8 02:39:31 2002 -@@ -38,6 +38,7 @@ - { - zval **p1; - php_struct *ctx; -+ SLS_FETCH(); - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &p1) == FAILURE) - return NULL; -@@ -109,6 +110,7 @@ - php_struct *ctx; - apr_array_header_t *arr; - char *key, *val; -+ SLS_FETCH(); - - if (array_init(return_value) == FAILURE) { - RETURN_FALSE; -@@ -135,7 +137,7 @@ - }; - - static zend_module_entry php_apache_module = { -- STANDARD_MODULE_HEADER, -+ STANDARD_MODULE_HEADER, - "Apache 2.0", - apache_functions, - NULL, -diff -urN php-4.1.2.org/sapi/apache2filter/sapi_apache2.c php-4.1.2/sapi/apache2filter/sapi_apache2.c ---- php-4.1.2.org/sapi/apache2filter/sapi_apache2.c Mon Apr 8 02:40:24 2002 -+++ php-4.1.2/sapi/apache2filter/sapi_apache2.c Mon Apr 8 02:30:57 2002 -@@ -1,8 +1,8 @@ - /* - +----------------------------------------------------------------------+ -- | PHP version 4.0 | -+ | PHP Version 4 | - +----------------------------------------------------------------------+ -- | Copyright (c) 1997-2001 The PHP Group | -+ | Copyright (c) 1997-2002 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 | -@@ -48,6 +48,7 @@ - { - apr_bucket *b; - apr_bucket_brigade *bb; -+ apr_bucket_alloc_t *ba; - php_struct *ctx; - uint now; - -@@ -55,10 +56,11 @@ - - if (str_length == 0) return 0; - -- bb = apr_brigade_create(ctx->f->r->pool); -+ ba = ctx->f->r->connection->bucket_alloc; -+ bb = apr_brigade_create(ctx->f->r->pool, ba); - while (str_length > 0) { - now = MIN(str_length, 4096); -- b = apr_bucket_transient_create(str, now); -+ b = apr_bucket_transient_create(str, now, ba); - APR_BRIGADE_INSERT_TAIL(bb, b); - str += now; - str_length -= now; -@@ -145,7 +147,7 @@ - php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) - { - php_struct *ctx = SG(server_context); -- apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env); -+ const apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env); - char *key, *val; - - APR_ARRAY_FOREACH_OPEN(arr, key, val) -@@ -161,15 +163,20 @@ - { - php_struct *ctx = server_context; - apr_bucket_brigade *bb; -+ apr_bucket_alloc_t *ba; - apr_bucket *b; - -+ if (!server_context) -+ return; -+ - /* Send a flush bucket down the filter chain. The current default - * handler seems to act on the first flush bucket, but ignores - * all further flush buckets. - */ - -- bb = apr_brigade_create(ctx->f->r->pool); -- b = apr_bucket_flush_create(); -+ ba = ctx->f->r->connection->bucket_alloc; -+ bb = apr_brigade_create(ctx->f->r->pool, ba); -+ b = apr_bucket_flush_create(ba); - APR_BRIGADE_INSERT_TAIL(bb, b); - if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) { - php_handle_aborted_connection(); -@@ -182,8 +189,13 @@ - TSRMLS_FETCH(); - - ctx = SG(server_context); -- -- apr_file_puts(msg, ctx->f->r->server->error_log); -+ -+ /* We use APLOG_STARTUP because it keeps us from printing the -+ * data and time information at the beginning of the error log -+ * line. Not sure if this is correct, but it mirrors what happens -+ * with Apache 1.3 -- rbb -+ */ -+ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP, 0, ctx->f->r->server, "%s", msg); - } - - static sapi_module_struct apache2_sapi_module = { -@@ -226,11 +238,11 @@ - if (ctx == NULL) { \ - /* Initialize filter context */ \ - SG(server_context) = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); \ -- ctx->bb = apr_brigade_create(f->c->pool); \ -+ ctx->bb = apr_brigade_create(f->c->pool, f->c->bucket_alloc); \ - } - - static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, -- ap_input_mode_t mode, apr_size_t *readbytes) -+ ap_input_mode_t mode, apr_read_type_e block, apr_off_t readbytes) - { - php_struct *ctx; - long old_index; -@@ -240,11 +252,15 @@ - apr_status_t rv; - TSRMLS_FETCH(); - -+ if (f->r->proxyreq) { -+ return ap_get_brigade(f->next, bb, mode, block, readbytes); -+ } -+ - ctx = SG(server_context); - - INIT_CTX; - -- if ((rv = ap_get_brigade(f->next, bb, mode, readbytes)) != APR_SUCCESS) { -+ if ((rv = ap_get_brigade(f->next, bb, mode, block, readbytes)) != APR_SUCCESS) { - return rv; - } - -@@ -307,6 +323,14 @@ - void *conf = ap_get_module_config(f->r->per_dir_config, &php4_module); - TSRMLS_FETCH(); - -+ if (f->r->proxyreq) { -+ return ap_pass_brigade(f->next, bb); -+ } -+ -+ /* setup standard CGI variables */ -+ ap_add_common_vars(f->r); -+ ap_add_cgi_vars(f->r); -+ - ctx = SG(server_context); - INIT_CTX; - -@@ -361,9 +385,9 @@ - php_execute_script(&zfd TSRMLS_CC); - } else { - --#define NO_DATA "The PHP Filter did not receive suitable input data" -+#define PHP_NO_DATA "The PHP Filter did not receive suitable input data" - -- eos = apr_bucket_transient_create(NO_DATA, sizeof(NO_DATA)-1); -+ eos = apr_bucket_transient_create(PHP_NO_DATA, sizeof(PHP_NO_DATA)-1, f->c->bucket_alloc); - APR_BRIGADE_INSERT_HEAD(bb, eos); - } - } -@@ -372,7 +396,7 @@ - - SG(server_context) = 0; - /* Pass EOS bucket to next filter to signal end of request */ -- eos = apr_bucket_eos_create(); -+ eos = apr_bucket_eos_create(f->c->bucket_alloc); - APR_BRIGADE_INSERT_TAIL(bb, eos); - - return ap_pass_brigade(f->next, bb); -@@ -391,21 +415,67 @@ - return APR_SUCCESS; - } - --static void --php_apache_server_startup(apr_pool_t *pchild, server_rec *s) -+static void php_apache_add_version(apr_pool_t *p) -+{ -+ TSRMLS_FETCH(); -+ if (PG(expose_php)) { -+ ap_add_version_component(p, "PHP/" PHP_VERSION); -+ } -+} -+ -+static int -+php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, -+ apr_pool_t *ptemp, server_rec *s) - { - tsrm_startup(1, 1, 0, NULL); - sapi_startup(&apache2_sapi_module); - apache2_sapi_module.startup(&apache2_sapi_module); -- apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown, NULL); -+ apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null); - php_apache_register_module(); -+ php_apache_add_version(pconf); -+ -+ return OK; -+} -+ -+static void php_add_filter(request_rec *r, ap_filter_t *f) -+{ -+ int output = (f == r->output_filters); -+ -+ /* for those who still have Set*Filter PHP configured */ -+ while (f) { -+ if (strcmp(f->frec->name, "PHP") == 0) { -+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, -+ 0, r->server, -+ "\"Set%sFilter PHP\" already configured for %s", -+ output ? "Output" : "Input", r->uri); -+ return; -+ } -+ f = f->next; -+ } -+ -+ if (output) { -+ ap_add_output_filter("PHP", NULL, r, r->connection); -+ } -+ else { -+ ap_add_input_filter("PHP", NULL, r, r->connection); -+ } -+} -+ -+static void php_insert_filter(request_rec *r) -+{ -+ if (r->content_type && -+ strcmp(r->content_type, "application/x-httpd-php") == 0) { -+ php_add_filter(r, r->output_filters); -+ php_add_filter(r, r->input_filters); -+ } - } - - static void php_register_hook(apr_pool_t *p) - { -- ap_hook_child_init(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE); -- ap_register_output_filter("PHP", php_output_filter, AP_FTYPE_CONTENT); -- ap_register_input_filter("PHP", php_input_filter, AP_FTYPE_CONTENT); -+ ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_hook_insert_filter(php_insert_filter, NULL, NULL, APR_HOOK_MIDDLE); -+ ap_register_output_filter("PHP", php_output_filter, AP_FTYPE_RESOURCE); -+ ap_register_input_filter("PHP", php_input_filter, AP_FTYPE_RESOURCE); - } - - AP_MODULE_DECLARE_DATA module php4_module = { -@@ -417,3 +487,12 @@ - php_dir_cmds, /* command apr_table_t */ - php_register_hook /* register hooks */ - }; -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ diff --git a/php-build_modules.patch b/php-build_modules.patch deleted file mode 100644 index cf222ec..0000000 --- a/php-build_modules.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur php-4.1.2.orig/ext/skeleton/create_stubs php-4.1.2/ext/skeleton/create_stubs ---- php-4.1.2.orig/ext/skeleton/create_stubs Fri May 31 11:50:08 2002 -+++ php-4.1.2/ext/skeleton/create_stubs Fri May 31 11:52:00 2002 -@@ -1,4 +1,4 @@ --#!/usr/bin/awk -f -+#!/bin/awk -f - - function gobble(s, x) - { diff --git a/php-cgi.ini b/php-cgi.ini deleted file mode 100644 index 6bdc817..0000000 --- a/php-cgi.ini +++ /dev/null @@ -1,14 +0,0 @@ -; php-cgi.ini - configuration used only for cgi SAPI -; -; Please note that, unlikely in original php distributions, this file -; is read AFTER (not instead of) reading global /etc/php/php.ini. -; -; It allows you to control global settings for all SAPIs in one place -; and override some settings in SAPI-specific files without need of -; copying whole large php.ini. - -[Session] -session.save_path = /tmp ; argument passed to save_handler - ; in the case of files, this is the - ; path where data files are stored - diff --git a/php-cli.ini b/php-cli.ini deleted file mode 100644 index fb68775..0000000 --- a/php-cli.ini +++ /dev/null @@ -1,14 +0,0 @@ -; php-cli.ini - configuration used only for cli SAPI -; -; Please note that, unlikely in original php distributions, this file -; is read AFTER (not instead of) reading global /etc/php/php.ini. -; -; It allows you to control global settings for all SAPIs in one place -; and override some settings in SAPI-specific files without need of -; copying whole large php.ini. - -[Session] -session.save_path = /tmp ; argument passed to save_handler - ; in the case of files, this is the - ; path where data files are stored - diff --git a/php-cpdf-fix.patch b/php-cpdf-fix.patch deleted file mode 100644 index 77878d6..0000000 --- a/php-cpdf-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- php-4.3.2/ext/cpdf/config.m4.orig Wed Apr 30 10:23:06 2003 -+++ php-4.3.2/ext/cpdf/config.m4 Fri Jun 13 12:23:26 2003 -@@ -24,9 +24,9 @@ - ],) - AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],) - if test -z "$CPDF_JPEG_DIR"; then -- PHP_ADD_LIBRARY(jpeg) -+ PHP_ADD_LIBRARY(jpeg, , CPDF_SHARED_LIBADD) - else -- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib) -+ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD) - fi - ]) - ]) -@@ -49,22 +49,23 @@ - ],) - AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],) - if test -z "$CPDF_TIFF_DIR"; then -- PHP_ADD_LIBRARY(tiff) -+ PHP_ADD_LIBRARY(tiff, , CPDF_SHARED_LIBADD) - else -- PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib) -+ PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD) - fi - ]) - ]) - --AC_MSG_CHECKING(for cpdflib support) - AC_ARG_WITH(cpdflib, - [ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).], - [ -+ AC_MSG_CHECKING(for cpdflib support) - if test "$withval" = "no"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) -- PHP_NEW_EXTENSION(cpdf, cpdf.c) -+ PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared) -+ PHP_SUBST(CPDF_SHARED_LIBADD) - CPDF_JPEG_TEST - CPDF_TIFF_TEST - for i in $withval /usr /usr/local; do -@@ -78,10 +79,10 @@ - [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])]) - ]) - if test "$i" != "/usr" -a "$i" != "/usr/local"; then -- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib) -+ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD) - PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) - else -- PHP_ADD_LIBRARY(cpdf) -+ PHP_ADD_LIBRARY(cpdf, , CPDF_SHARED_LIBADD) - fi - break - fi diff --git a/php-dl-zlib.patch b/php-dl-zlib.patch deleted file mode 100644 index e2c62bd..0000000 --- a/php-dl-zlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -burN php-4.3.2/main/SAPI.c php-4.3.2-dl_zlib/main/SAPI.c ---- php-4.3.2/main/SAPI.c Wed Feb 12 00:30:13 2003 -+++ php-4.3.2-dl_zlib/main/SAPI.c Wed Jun 11 09:41:47 2003 -@@ -556,7 +556,7 @@ - while (*ptr == ' ' && *ptr != '\0') { - ptr++; - } --#if HAVE_ZLIB -+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -704,7 +704,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - diff --git a/php-domxml_node.patch b/php-domxml_node.patch deleted file mode 100644 index 8a28a8d..0000000 --- a/php-domxml_node.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-4.1.1/ext/domxml/php_domxml.c~ Thu Feb 14 15:23:48 2002 -+++ php-4.1.1/ext/domxml/php_domxml.c Thu Feb 14 15:23:48 2002 -@@ -833,6 +833,7 @@ - if (Z_TYPE_P(obj) == XML_ENTITY_REF_NODE) { - content = xmlNodeGetContent(nodep); - if (content) -+ add_property_long(wrapper, "type", Z_TYPE_P(nodep)); - add_property_stringl(wrapper, "content", (char *) content, strlen(content), 1); - } - break; diff --git a/php-hyperwave-fix.patch b/php-hyperwave-fix.patch deleted file mode 100644 index 1b622a9..0000000 --- a/php-hyperwave-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- php-4.3.0/ext/hyperwave/config.m4.orig Thu Jan 2 23:17:53 2003 -+++ php-4.3.0/ext/hyperwave/config.m4 Thu Jan 2 23:19:42 2003 -@@ -2,19 +2,12 @@ - dnl $Id$ - dnl - --AC_MSG_CHECKING(for Hyperwave support) --AC_ARG_WITH(hyperwave, --[ --with-hyperwave Include Hyperwave support], --[ -- if test "$withval" != "no"; then -+PHP_ARG_WITH(hyperwave, for Hyperwave support, -+[ --with-hyperwave Include Hyperwave support]) -+ -+ if test "$PHP_HYPERWAVE" != "no"; then - AC_DEFINE(HYPERWAVE,1,[ ]) -- AC_MSG_RESULT(yes) -- PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c) -+ PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c, $ext_shared) - else - AC_DEFINE(HYPERWAVE,0,[ ]) -- AC_MSG_RESULT(no) - fi --],[ -- AC_DEFINE(HYPERWAVE,0,[ ]) -- AC_MSG_RESULT(no) --]) diff --git a/php-image_c.patch b/php-image_c.patch deleted file mode 100644 index ee6215f..0000000 --- a/php-image_c.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- php-4.1.1/ext/standard/image.c~ Thu Feb 14 15:40:36 2002 -+++ php-4.1.1/ext/standard/image.c Thu Feb 14 15:40:36 2002 -@@ -323,7 +323,9 @@ - unsigned int marker; - char tmp[2]; - unsigned char a[4]; -- -+ unsigned short skip; -+ unsigned char *buffer; -+ - for (;;) { - marker = php_next_marker(socketd, fp, issock); - switch (marker) { -@@ -349,7 +351,12 @@ - result->height = (((unsigned short) a[ 0 ]) << 8) + ((unsigned short) a[ 1 ]); - result->width = (((unsigned short) a[ 2 ]) << 8) + ((unsigned short) a[ 3 ]); - result->channels = FP_FGETC(socketd, fp, issock); -- -+ /* skip component specification parameters */ -+ skip = result-> channels *3; -+ buffer = emalloc(skip); -+ FP_FREAD(buffer, (long) skip, socketd, fp, issock); -+ efree(buffer); -+ - if (! info) /* if we don't want an extanded info -> return */ - return result; - } else { diff --git a/php-imap.patch b/php-imap.patch deleted file mode 100644 index 9cfe802..0000000 --- a/php-imap.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- php-4.0.6/ext/imap/config.m4.imap Wed Jul 11 09:21:00 2001 -+++ php-4.0.6/ext/imap/config.m4 Wed Jul 11 09:28:24 2001 -@@ -49,14 +49,11 @@ - - if test "$PHP_IMAP_SSL" != "no"; then - PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER(crypto) -- PHP_ADD_LIBRARY_DEFER(ssl) -+ PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY(ssl, 1, IMAP_SHARED_LIBADD) - - old_LIBS=$LIBS -- LIBS="$LIBS -lc-client" -- if test $PHP_KERBEROS != "no"; then -- LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" -- fi -+ LIBS="$LIBS $IMAP_SHARED_LIBADD" - AC_TRY_RUN([ - void mm_log(void){} - void mm_dlog(void){} -@@ -133,8 +130,7 @@ - fi - - PHP_ADD_INCLUDE($IMAP_INC_DIR) -- PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD) -- PHP_ADD_LIBRARY_DEFER($IMAP_LIB) -+ PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD) - PHP_IMAP_KRB_CHK - PHP_IMAP_SSL_CHK - fi diff --git a/php-ini.patch b/php-ini.patch deleted file mode 100644 index f5d2637..0000000 --- a/php-ini.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- php-4.3.0/php.ini-dist Thu Dec 26 14:27:08 2002 -+++ php-4.3.0/php.ini Sat Jan 4 21:01:55 2003 -@@ -3,12 +3,18 @@ - ;;;;;;;;;;; - ; WARNING ; - ;;;;;;;;;;; --; This is the default settings file for new PHP installations. --; By default, PHP installs itself with a configuration suitable for --; development purposes, and *NOT* for production purposes. --; For several security-oriented considerations that should be taken --; before going online with your site, please consult php.ini-recommended --; and http://php.net/manual/en/security.php. -+; This is the default settings file for new PHP installations from -+; PLD Linux Distribution. -+; It's based mainly on php.ini-dist, but with some changes made with -+; security in mind (see below, consult also -+; http://php.net/manual/en/security.php). -+; -+; Please note, that in PLD installations, /etc/php/php.ini file -+; contains GLOBAL settings for all SAPIs (cgi, cli, apache...), -+; and after reading this file, SAPI-specific file (/etc/php/php-cgi.ini, -+; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED -+; (so you don't need to duplicate whole large file to override only -+; few options). - - - ;;;;;;;;;;;;;;;;;;; -@@ -54,12 +60,70 @@ - ; If you use constants in your value, and these constants belong to a - ; dynamically loaded extension (either a PHP extension or a Zend extension), - ; you may only use these constants *after* the line that loads the extension. --; --; All the values in the php.ini-dist file correspond to the builtin --; defaults (that is, if no php.ini is used, or if you delete these lines, --; the builtin defaults will be identical). - - -+; Below is the list of settings changed from default as specified in -+; php.ini-recommended. These settings make PHP more secure and encourage -+; cleaner coding. -+; The price is that with these settings, PHP may be incompatible with some old -+; or bad-written applications, and sometimes, more difficult to develop with. -+; Using this settings is warmly recommended for production sites. As all of -+; the changes from the standard settings are thoroughly documented, you can -+; go over each one, and decide whether you want to use it or not. -+; -+; - register_globals = Off [Security, Performance] -+; Global variables are no longer registered for input data (POST, GET, cookies, -+; environment and other server variables). Instead of using $foo, you must use -+; you can use $_REQUEST["foo"] (includes any variable that arrives through the -+; request, namely, POST, GET and cookie variables), or use one of the specific -+; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending -+; on where the input originates. Also, you can look at the -+; import_request_variables() function. -+; Note that register_globals = Off is the default setting since PHP 4.2.0. -+; - display_errors = Off [Security] -+; With this directive set to off, errors that occur during the execution of -+; scripts will no longer be displayed as a part of the script output, and thus, -+; will no longer be exposed to remote users. With some errors, the error message -+; content may expose information about your script, web server, or database -+; server that may be exploitable for hacking. Production sites should have this -+; directive set to off. -+; - log_errors = On [Security] -+; This directive complements the above one. Any errors that occur during the -+; execution of your script will be logged (typically, to your server's error log, -+; but can be configured in several ways). Along with setting display_errors to off, -+; this setup gives you the ability to fully understand what may have gone wrong, -+; without exposing any sensitive information to remote users. -+; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -+; By default, PHP surpresses errors of type E_NOTICE. These error messages -+; are emitted for non-critical errors, but that could be a symptom of a bigger -+; problem. Most notably, this will cause error messages about the use -+; of uninitialized variables to be displayed. -+ -+; For completeness, below is list of the rest of changes recommended for -+; performance, but NOT applied in default php.ini in PLD (since they are -+; not needed for security or may cause problems with some applications -+; more likely than above). -+ -+; - output_buffering = 4096 [Performance] -+; Set a 4KB output buffer. Enabling output buffering typically results in less -+; writes, and sometimes less packets sent on the wire, which can often lead to -+; better performance. The gain this directive actually yields greatly depends -+; on which Web server you're working with, and what kind of scripts you're using. -+; - register_argc_argv = Off [Performance] -+; Disables registration of the somewhat redundant $argv and $argc global -+; variables. -+; - magic_quotes_gpc = Off [Performance] -+; Input data is no longer escaped with slashes so that it can be sent into -+; SQL databases without further manipulation. Instead, you should use the -+; function addslashes() on each input element you wish to send to a database. -+; - variables_order = "GPCS" [Performance] -+; The environment variables are not hashed into the $HTTP_ENV_VARS[]. To access -+; environment variables, you can use getenv() instead. -+; - allow_call_time_pass_reference = Off [Code cleanliness] -+; It's not possible to decide to force a variable to be passed by reference -+; when calling a function. The PHP 4 style to do this is by making the -+; function require the relevant argument by reference. -+ - ;;;;;;;;;;;;;;;;;;;; - ; Language Options ; - ;;;;;;;;;;;;;;;;;;;; -@@ -79,7 +143,7 @@ - asp_tags = Off - - ; The number of significant digits displayed in floating point numbers. --precision = 12 -+precision = 14 - - ; Enforce year 2000 compliance (will cause problems with non-compliant browsers) - y2k_compliance = On -@@ -255,16 +319,16 @@ - ; - ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR - ; --; - Show all errors except for notices -+; - Show all errors - ; --error_reporting = E_ALL & ~E_NOTICE -+error_reporting = E_ALL - - ; Print out errors (as a part of the output). For production web sites, - ; you're strongly encouraged to turn this feature off, and use error logging - ; instead (see below). Keeping display_errors enabled on a production web site - ; may reveal security information to end users, such as file paths on your Web - ; server, your database schema or other information. --display_errors = On -+display_errors = Off - - ; Even when display_errors is on, errors that occur during PHP's startup - ; sequence are not displayed. It's strongly recommended to keep -@@ -274,7 +338,7 @@ - ; Log errors into a log file (server-specific log, stderr, or error_log (below)) - ; As stated above, you're strongly advised to use error logging in place of - ; error displaying on production web sites. --log_errors = Off -+log_errors = On - - ; Set maximum length of log_errors. In error_log information about the source is - ; added. The default is 1024 and 0 allows to not apply any maximum length at all. -@@ -420,7 +484,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "./" -+extension_dir = "/usr/lib/php" - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -@@ -587,10 +651,10 @@ - ;sendmail_path = - - [Java] --;java.class.path = .\php_java.jar --;java.home = c:\jdk --;java.library = c:\jdk\jre\bin\hotspot\jvm.dll --;java.library.path = .\ -+java.class.path = /usr/lib/php/php_java.jar -+;java.home = /usr/lib/java -+;java.library = /usr/lib/java/jre/lib/i386/libjava.so -+java.library.path = /usr/lib/php - - [SQL] - sql.safe_mode = Off -@@ -685,6 +749,7 @@ - pgsql.max_links = -1 - - ; Ignore PostgreSQL backends Notice message or not. -+; Notice message logging require a little overheads. - pgsql.ignore_notice = 0 - - ; Log PostgreSQL backends Noitce message or not. -@@ -804,7 +869,9 @@ - ; You can use the script in the ext/session dir for that purpose. - ; NOTE 2: See the section on garbage collection below if you choose to - ; use subdirectories for session storage --session.save_path = /tmp -+; NOTE 3: you may need to override this setting for cli or cgi SAPIs, -+; to allow running them as user other than http -+session.save_path = /var/run/php - - ; Whether to use cookies. - session.use_cookies = 1 diff --git a/php-java-norpath.patch b/php-java-norpath.patch deleted file mode 100644 index b6553c6..0000000 --- a/php-java-norpath.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -burN php-4.3.2/ext/java/config.m4 php-4.3.2-java-norpath/ext/java/config.m4 ---- php-4.3.2/ext/java/config.m4 Fri Apr 4 19:43:13 2003 -+++ php-4.3.2-java-norpath/ext/java/config.m4 Wed Jun 11 09:38:23 2003 -@@ -58,7 +58,6 @@ - AC_DEFUN(JAVA_CHECK_LIB, [ - AC_MSG_CHECKING([Checking for libjava]) - if test -d $PHP_JAVA/lib/kaffe; then -- PHP_ADD_LIBPATH($PHP_JAVA/lib) - JAVA_CFLAGS=-DKAFFE - JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe - JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar -@@ -111,10 +110,6 @@ - JAVA_LIB=java - JAVA_LIBPATH=$i - -- test -d $i/hotspot && PHP_ADD_LIBPATH($i/hotspot) -- test -d $i/classic && PHP_ADD_LIBPATH($i/classic) -- test -d $i/server && PHP_ADD_LIBPATH($i/server) -- test -d $i/native_threads && PHP_ADD_LIBPATH($i/native_threads) - fi - done - -@@ -160,19 +155,12 @@ - AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA]) - fi - -- PHP_ADD_LIBPATH($JAVA_LIBPATH) - JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'" - fi - - if test "$PHP_SAPI" != "servlet"; then - PHP_NEW_EXTENSION(java, java.c, shared,, $JAVA_CFLAGS $JAVA_INCLUDE) - -- if test "$PHP_SAPI" = "cgi"; then -- if test "$platform" != "Darwin"; then -- PHP_ADD_LIBRARY($JAVA_LIB) -- fi -- fi -- - if test -n "$INSTALL_IT"; then - INSTALL_IT="$INSTALL_IT ;" - fi diff --git a/php-libpq_fs_h_path.patch b/php-libpq_fs_h_path.patch deleted file mode 100644 index 37e96eb..0000000 --- a/php-libpq_fs_h_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-4.3.0/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002 -+++ php-4.3.0/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002 -@@ -43,7 +43,7 @@ - #define PHPAPI __declspec(dllimport) - #endif - #else --#include -+#include - #endif - - #ifdef HAVE_PG_CONFIG_H diff --git a/php-libtool.patch b/php-libtool.patch deleted file mode 100644 index 0a06d48..0000000 --- a/php-libtool.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- php-4.3.0/acinclude.m4.orig Sun Nov 17 20:28:57 2002 -+++ php-4.3.0/acinclude.m4 Fri Jan 3 09:59:15 2003 -@@ -838,13 +838,13 @@ - dnl - AC_DEFUN([PHP_BUILD_PROGRAM],[ - OVERALL_TARGET=[]ifelse($1,,php,$1) -- php_c_pre='$(CC)' -+ php_c_pre='$(LIBTOOL) --mode=compile $(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -- php_cxx_pre='$(CXX)' -+ php_c_post= -+ php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -- php_lo=o -+ php_cxx_post= -+ php_lo=lo - - shared_c_pre='$(LIBTOOL) --mode=compile $(CC)' - shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic' diff --git a/php-libxml2.patch b/php-libxml2.patch deleted file mode 100644 index 73840e4..0000000 --- a/php-libxml2.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- php-4.0.6/ext/domxml/config.m4~ Thu Nov 15 00:32:45 2001 -+++ php-4.0.6/ext/domxml/config.m4 Thu Nov 15 00:32:45 2001 -@@ -3,7 +3,7 @@ - - AC_DEFUN(PHP_DOM_CHECK_VERSION,[ - old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS=-I$DOMXML_DIR/include -+ CPPFLAGS=-I$DOMXML_DIR/include/libxml2 - AC_MSG_CHECKING(for libxml version) - AC_EGREP_CPP(yes,[ - #include -@@ -25,12 +25,12 @@ - - if test "$PHP_DOM" != "no"; then - -- if test -r $PHP_DOM/include/libxml/tree.h; then -+ if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then - DOMXML_DIR=$PHP_DOM - else - AC_MSG_CHECKING(for DOM in default path) - for i in /usr/local /usr; do -- if test -r $i/include/libxml/tree.h; then -+ if test -r $i/include/libxml2/libxml/tree.h; then - DOMXML_DIR=$i - AC_MSG_RESULT(found in $i) - fi ---- php-4.0.6/ext/domxml/Makefile.in~ Thu Nov 15 01:20:18 2001 -+++ php-4.0.6/ext/domxml/Makefile.in Thu Nov 15 01:20:18 2001 -@@ -5,4 +5,6 @@ - LTLIBRARY_SHARED_NAME = domxml.la - LTLIBRARY_SHARED_LIBADD = $(DOMXML_SHARED_LIBADD) - -+EXTRA_CFLAGS = `pkg-config libxml-2.0 --cflags` -+ - include $(top_srcdir)/build/dynlib.mk diff --git a/php-link-libs.patch b/php-link-libs.patch deleted file mode 100644 index 5e9354b..0000000 --- a/php-link-libs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-4.3.0/configure.in.orig Fri Dec 27 05:07:18 2002 -+++ php-4.3.0/configure.in Thu Jan 2 20:34:43 2003 -@@ -288,7 +288,6 @@ - PHP_CHECK_FUNC(htonl, socket) - PHP_CHECK_FUNC(gethostname, nsl) - PHP_CHECK_FUNC(gethostbyaddr, nsl) --PHP_CHECK_FUNC(yp_get_default_domain, nsl) - - PHP_CHECK_FUNC(dlopen, dl) - if test "$ac_cv_func_dlopen" = "yes"; then diff --git a/php-mail.patch b/php-mail.patch deleted file mode 100644 index 1db4c2b..0000000 --- a/php-mail.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002 -+++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003 -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - #include "php.h" - #include "ext/standard/info.h" - -@@ -36,6 +38,9 @@ - #include "safe_mode.h" - #include "exec.h" - -+#include "zend_operators.h" -+#include "zend_globals.h" -+ - #if HAVE_SENDMAIL - #ifdef PHP_WIN32 - #include "win32/sendmail.h" -@@ -196,8 +201,42 @@ - return 0; - } - #endif -- fprintf(sendmail, "To: %s\n", to); -- fprintf(sendmail, "Subject: %s\n", subject); -+ TSRMLS_FETCH(); -+ -+ if ((to != NULL) && (strlen(to)!=0)) { -+ fprintf(sendmail, "To: %s\n", to); -+ } -+ if ((subject != NULL) && (strlen(subject)!=0)) { -+ fprintf(sendmail, "Subject: %s\n", subject); -+ } -+ -+ if (PG(http_globals)[TRACK_VARS_SERVER]) { -+ zval **remote_addr, **server_name, **server_port, -+ **request_uri, **http_user_agent; -+ -+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **) &remote_addr)==SUCCESS) { -+ convert_to_string_ex(remote_addr); -+ fprintf(sendmail, "HTTP-Posting-Client: %s\n", Z_STRVAL_PP(remote_addr)); -+ } -+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &server_name)==SUCCESS) { -+ convert_to_string_ex(server_name); -+ fprintf(sendmail, "HTTP-Posting-URI: %s", Z_STRVAL_PP(server_name)); -+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "SERVER_PORT", sizeof("SERVER_PORT"), (void **) &server_port)==SUCCESS) { -+ convert_to_string_ex(server_port); -+ fprintf(sendmail, ":%s", Z_STRVAL_PP(server_port)); -+ } -+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "REQUEST_URI", sizeof("REQUEST_URI"), (void **) &request_uri)==SUCCESS) { -+ convert_to_string_ex(request_uri); -+ fprintf(sendmail, "%s", Z_STRVAL_PP(request_uri)); -+ } -+ fprintf(sendmail, "\n"); -+ } -+ if (zend_hash_find(PG(http_globals)[TRACK_VARS_SERVER]->value.ht, "HTTP_USER_AGENT", sizeof("HTTP_USER_AGENT"), (void **) &http_user_agent)==SUCCESS) { -+ convert_to_string_ex(http_user_agent); -+ fprintf(sendmail, "HTTP-Posting-User-Agent: %s\n", Z_STRVAL_PP(http_user_agent)); -+ } -+ } -+ - if (headers != NULL) { - fprintf(sendmail, "%s\n", headers); - } diff --git a/php-mailsecurity2.patch b/php-mailsecurity2.patch deleted file mode 100644 index 0e4e89d..0000000 --- a/php-mailsecurity2.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- php4/ext/standard/mail.c 2 Apr 2001 16:37:50 -0000 1.41 -+++ php4/ext/standard/mail.c 25 Sep 2001 22:48:43 -0000 1.44 -@@ -12,7 +12,7 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id$ */ -+/* $Id$ */ - - #include - #include -@@ -54,8 +56,8 @@ - } - - convert_to_string_ex(pstr); -- if ((*pstr)->value.str.val) { -- str = (*pstr)->value.str.val; -+ if (Z_STRVAL_PP(pstr)) { -+ str = Z_STRVAL_PP(pstr); - } else { - php_error(E_WARNING, "Must give string parameter to ezmlm_hash()"); - RETURN_FALSE; -@@ -85,8 +88,8 @@ - } - /* To: */ - convert_to_string_ex(argv[0]); -- if ((*argv[0])->value.str.val) { -- to = (*argv[0])->value.str.val; -+ if (Z_STRVAL_PP(argv[0])) { -+ to = Z_STRVAL_PP(argv[0]); - } else { - php_error(E_WARNING, "No to field in mail command"); - RETURN_FALSE; -@@ -94,8 +97,8 @@ - - /* Subject: */ - convert_to_string_ex(argv[1]); -- if ((*argv[1])->value.str.val) { -+ if (Z_STRVAL_PP(argv[1])) { - subject = Z_STRVAL_PP(argv[1]); - } else { - php_error(E_WARNING, "No subject field in mail command"); - RETURN_FALSE; -@@ -103,8 +106,8 @@ - - /* message body */ - convert_to_string_ex(argv[2]); -- if ((*argv[2])->value.str.val) { -+ if (Z_STRVAL_PP(argv[2])) { - message = Z_STRVAL_PP(argv[2]); - } else { - /* this is not really an error, so it is allowed. */ - php_error(E_WARNING, "No message string in mail command"); diff --git a/php-mcal-shared-lib.patch b/php-mcal-shared-lib.patch deleted file mode 100644 index a39ae73..0000000 --- a/php-mcal-shared-lib.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./ext/mcal/config.m4.org Mon Jun 24 13:37:15 2002 -+++ ./ext/mcal/config.m4 Sat Sep 7 11:19:45 2002 -@@ -20,7 +20,7 @@ - done - - for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do -- if test -r "$i/libmcal.a"; then -+ if test -r "$i/libmcal.so" -o -r "$i/libmcal.a"; then - MCAL_LIBRARY=$i - fi - done -@@ -37,8 +37,8 @@ - AC_MSG_ERROR(Unable to locate your libmcal header files - icalroutines.h should be in the directory you specify or in the include/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) - fi - -- if test ! -f "$MCAL_LIBRARY/libmcal.a"; then -- AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.a should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) -+ if test ! -f "$MCAL_LIBRARY/libmcal.a" -a ! -f "$MCAL_LIBRARY/libmcal.so"; then -+ AC_MSG_ERROR(Unable to locate your libmcal library files - libmcal.* should be in the directory you specify or in the lib/ subdirectory below it - default search location is $MCAL_DEFAULT_SEARCH) - fi - - PHP_ADD_INCLUDE($MCAL_INCLUDE) diff --git a/php-mnogosearch-php-extension-1.68.patch b/php-mnogosearch-php-extension-1.68.patch deleted file mode 100644 index 6d08207..0000000 --- a/php-mnogosearch-php-extension-1.68.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -urN php-4.3.1.org/ext/mnogosearch/php_mnogo.c php-4.3.1/ext/mnogosearch/php_mnogo.c ---- php-4.3.1.org/ext/mnogosearch/php_mnogo.c Mon Feb 24 21:42:43 2003 -+++ php-4.3.1/ext/mnogosearch/php_mnogo.c Mon Dec 16 20:17:09 2002 -@@ -1,5 +1,5 @@ - /* $Source$ */ --/* $Id$ */ -+/* $Id$ */ - - /* - +----------------------------------------------------------------------+ -@@ -163,6 +163,8 @@ - #if UDM_VERSION_ID >= 30204 - PHP_FE(udm_parse_query_string, NULL) - PHP_FE(udm_make_excerpt, NULL) -+ PHP_FE(udm_set_agent_param_ex, NULL) -+ PHP_FE(udm_get_res_field_ex, NULL) - #endif - #endif - -@@ -466,7 +468,9 @@ - UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr); - if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){ - sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr); -+#if UDM_VERSION_ID <= 30207 - Env->errcode=1; -+#endif - php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } -@@ -517,7 +521,9 @@ - UdmVarListReplaceStr(&Env->Vars,"DBAddr",dbaddr); - if(UDM_OK!=UdmDBSetAddr(Env->db,dbaddr,UDM_OPEN_MODE_READ)){ - sprintf(Env->errstr,"Invalid DBAddr: '%s'",dbaddr); -+#if UDM_VERSION_ID <= 30207 - Env->errcode=1; -+#endif - php_error(E_WARNING,"%s(): Invalid DBAddr", get_active_function_name(TSRMLS_C)); - RETURN_FALSE; - } -@@ -997,6 +1003,8 @@ - case UDM_PARAM_VARDIR: - #if UDM_VERSION_ID < 30200 - udm_snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); -+#elif UDM_VERSION_ID >= 30208 -+ UdmVarListReplaceStr(&Agent->Conf->Vars,"Vardir",val); - #elif UDM_VERSION_ID >= 30204 - UdmVarListReplaceStr(&Agent->Conf->Vars,"Vardir",val); - snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); -@@ -1665,6 +1673,106 @@ - RETURN_TRUE; - } - /* }}} */ -+ -+/* {{{ proto int udm_set_agent_param_ex(int agent, string var, string val) -+ Set mnoGoSearch agent session parameters extended */ -+DLEXPORT PHP_FUNCTION(udm_set_agent_param_ex) -+{ -+ pval **yyagent, **yyvar, **yyval; -+ char *val, *var; -+ UDM_AGENT * Agent; -+ -+ switch(ZEND_NUM_ARGS()){ -+ -+ case 3: -+ if(zend_get_parameters_ex(3,&yyagent,&yyvar,&yyval)==FAILURE){ -+ RETURN_FALSE; -+ } -+ convert_to_string_ex(yyvar); -+ convert_to_string_ex(yyval); -+ ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-agent", le_link); -+ var = Z_STRVAL_PP(yyvar); -+ val = Z_STRVAL_PP(yyval); -+ -+ break; -+ -+ default: -+ WRONG_PARAM_COUNT; -+ break; -+ } -+ -+ UdmVarListReplaceStr(&Agent->Conf->Vars,var,val); -+ -+ if (!strcasecmp(var,"LocalCharset")) { -+ const char * charset=UdmVarListFindStr(&Agent->Conf->Vars,"LocalCharset","iso-8859-1"); -+ Agent->Conf->lcs=UdmGetCharSet(charset); -+ } else if (!strcasecmp(var,"BrowserCharset")) { -+ const char * charset=UdmVarListFindStr(&Agent->Conf->Vars,"BrowserCharset","iso-8859-1"); -+ Agent->Conf->bcs=UdmGetCharSet(charset); -+ } else if (!strcasecmp(var,"Synonym")) { -+ if (UdmSynonymListLoad(Agent->Conf,val)) { -+ php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C),Agent->Conf->errstr); -+ RETURN_FALSE; -+ } else UdmSynonymListSort(&(Agent->Conf->Synonyms)); -+ } else if (!strcasecmp(var,"Stopwordfile")) { -+ if (UdmStopListLoad(Agent->Conf,val)) { -+ php_error(E_WARNING, "%s(): %s", Agent->Conf->errstr, get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+ } else if (!strcasecmp(var,"MinWordLen")) { -+ Agent->Conf->WordParam.min_word_len=atoi(val); -+ } else if (!strcasecmp(var,"MaxWordLen")) { -+ Agent->Conf->WordParam.max_word_len=atoi(val); -+#if UDM_VERSION_ID <= 30207 -+ } else if (!strcasecmp(var,"VarDir")) { -+ snprintf(Agent->Conf->vardir,sizeof(Agent->Conf->vardir)-1,"%s%s",val,UDMSLASHSTR); -+#endif -+ } -+ -+ RETURN_TRUE; -+} -+ -+/* {{{ proto string udm_get_res_field_ex(int res, int row, string field) -+ Fetch mnoGoSearch result field */ -+DLEXPORT PHP_FUNCTION(udm_get_res_field_ex) -+{ -+ pval **yyres, **yyrow_num, **yyfield_name; -+ -+ UDM_RESULT * Res; -+ int row; -+ char *field; -+ -+ switch(ZEND_NUM_ARGS()){ -+ case 3: { -+ if (zend_get_parameters_ex(3, &yyres,&yyrow_num,&yyfield_name)==FAILURE){ -+ RETURN_FALSE; -+ } -+ convert_to_string_ex(yyrow_num); -+ convert_to_string_ex(yyfield_name); -+ field = Z_STRVAL_PP(yyfield_name); -+ row = atoi(Z_STRVAL_PP(yyrow_num)); -+ } -+ break; -+ default: -+ WRONG_PARAM_COUNT; -+ break; -+ } -+ -+ ZEND_FETCH_RESOURCE(Res, UDM_RESULT *, yyres, -1, "mnoGoSearch-Result", le_res); -+ if(rownum_rows){ -+ if (!strcasecmp(field,"URL")) { -+ char *al; -+ al = (char *)MyRemoveHiLightDup((const char *)(UdmVarListFindStr(&(Res->Doc[row].Sections), field, ""))); -+ UdmVarListReplaceStr(&Res->Doc[row].Sections,field,al); -+ free(al); -+ } -+ RETURN_STRING((char *)UdmVarListFindStr(&Res->Doc[row].Sections,field,""),1); -+ } else { -+ php_error(E_WARNING,"%s(): row number too large", get_active_function_name(TSRMLS_C)); -+ RETURN_FALSE; -+ } -+} -+/* }}} */ - #endif - - /* {{{ proto int udm_find(int agent, string query) -@@ -2071,7 +2179,13 @@ - break; - } - ZEND_FETCH_RESOURCE(Agent, UDM_AGENT *, yyagent, -1, "mnoGoSearch-Agent", le_link); --#if UDM_VERSION_ID >= 30204 -+#if UDM_VERSION_ID >= 30208 -+ if (UdmEnvErrMsg(Agent->Conf) && strlen(UdmEnvErrMsg(Agent->Conf))) { -+ RETURN_LONG(1); -+ } else { -+ RETURN_LONG(0); -+ } -+#elif UDM_VERSION_ID >= 30204 - RETURN_LONG(UdmEnvErrCode(Agent->Conf)); - #else - RETURN_LONG(UdmDBErrorCode(Agent->db)); -diff -urN php-4.3.1.org/ext/mnogosearch/php_mnogo.h php-4.3.1/ext/mnogosearch/php_mnogo.h ---- php-4.3.1.org/ext/mnogosearch/php_mnogo.h Mon Feb 24 21:42:43 2003 -+++ php-4.3.1/ext/mnogosearch/php_mnogo.h Sun Nov 24 20:39:46 2002 -@@ -1,5 +1,5 @@ - /* $Source$ */ --/* $Id$ */ -+/* $Id$ */ - - /* - +----------------------------------------------------------------------+ -@@ -68,6 +68,8 @@ - #if UDM_VERSION_ID >= 30204 - DLEXPORT PHP_FUNCTION(udm_parse_query_string); - DLEXPORT PHP_FUNCTION(udm_make_excerpt); -+DLEXPORT PHP_FUNCTION(udm_set_agent_param_ex); -+DLEXPORT PHP_FUNCTION(udm_get_res_field_ex); - #endif - #endif - diff --git a/php-mod_php.conf b/php-mod_php.conf deleted file mode 100644 index 7c05c1f..0000000 --- a/php-mod_php.conf +++ /dev/null @@ -1,9 +0,0 @@ -LoadModule php4_module lib/apache/libphp4.so - - - -AddType application/x-httpd-php .php -AddType application/x-httpd-php .php3 -AddType application/x-httpd-php .php4 - - diff --git a/php-module-install b/php-module-install deleted file mode 100644 index cdccc39..0000000 --- a/php-module-install +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -VERSION="$0 V 0.1 (C) 2001 Artur Frysiak" -COMMAND=usage -VERBOSE="" -MODNAME="" -INIFILE="" - -install () -{ -if [ -f ${INIFILE} ] && ! grep -q "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" ${INIFILE} ; then - echo "activating module '${MODNAME}.so' in ${INIFILE}" 1>&2 - echo "extension=${MODNAME}.so" >> ${INIFILE} -fi -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 -fi -} - -deinstall() -{ -if [ -f ${INIFILE} ] && grep -q "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" ${INIFILE} ; then - TMPFILE=`mktemp -q /tmp/php-module-install.XXXXXX` - if [ $? -ne 0 ]; then - echo "$0: Can't create temp file, exiting..." - exit 1 - fi - echo "deactivating module '${MODNAME}.so' in ${INIFILE}" 1>&2 - grep -v "^extension[[:space:]]*=[[:space:]]*${MODNAME}.so" > ${TMPFILE} < ${INIFILE} - mv ${TMPFILE} ${INIFILE} - chmod 644 ${INIFILE} -fi -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 -fi -} - -usage() -{ - echo $VERSION - echo "Usage:" - echo " $0 install MODNAME INIFILE" - echo " $0 remove MODNAME INIFILE" -} - -if [ "$#" = 3 ]; then - MODNAME="$2" - INIFILE="$3" - - if [ "$1" = "install" ]; then - install - else - if [ "$1" = "remove" ]; then - deinstall - else - usage - fi - fi -else - usage - exit 1 -fi - -exit 0 diff --git a/php-msession-shared-lib.patch b/php-msession-shared-lib.patch deleted file mode 100644 index dc2fa60..0000000 --- a/php-msession-shared-lib.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- php-4.3.0/ext/msession/config.m4.orig Thu Jan 2 20:40:11 2003 -+++ php-4.3.0/ext/msession/config.m4 Thu Jan 2 20:42:17 2003 -@@ -6,12 +6,12 @@ - [ --with-msession[=DIR] Include msession support]) - - if test "$PHP_MSESSION" != "no"; then -- if test -r $PHP_MSESSION/lib/libphoenix.a; then -+ if test -r $PHP_MSESSION/lib/libphoenix.so -o -r $PHP_MSESSION/lib/libphoenix.a; then - PHOENIX_DIR=$PHP_MSESSION - else - AC_MSG_CHECKING(for msession in default path) - for i in /usr/local/phoenix /usr/local /usr; do -- if test -r $i/lib/libphoenix.a; then -+ if test -r $i/lib/libphoenix.so -o -r $i/lib/libphoenix.a; then - PHOENIX_DIR=$i - AC_MSG_RESULT(found in $i) - fi -@@ -25,9 +25,9 @@ - - - AC_DEFINE(HAVE_MSESSION, 1, [ ]) -- PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", PHOENIX_LIB) -+ PHP_ADD_LIBRARY_WITH_PATH(phoenix, "$PHOENIX_DIR/lib", MSESSION_SHARED_LIBADD) - PHOENIX_INCLUDE="-I$PHOENIX_DIR" -- PHP_SUBST(PHOENIX_LIB) -+ PHP_SUBST(MSESSION_SHARED_LIBADD) - - PHP_NEW_EXTENSION(msession, msession.c, $ext_shared) - fi diff --git a/php-no-metaccld.patch b/php-no-metaccld.patch deleted file mode 100644 index 338ebd5..0000000 --- a/php-no-metaccld.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- php-4.3.2/configure.in.orig Fri Jun 13 16:12:24 2003 -+++ php-4.3.2/configure.in Tue Jun 17 17:05:41 2003 -@@ -1053,19 +1053,6 @@ - PHP_SUBST_OLD(YACC) - PHP_SUBST_OLD(SHLIB_SUFFIX_NAME) - --old_CC=$CC -- --if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then -- CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" -- INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" -- cat >meta_ccld<= 20010901 for new ZEND_MODULE support, -+ so that it compiles with older PHP Versions too -+ - TSRMLS fixes included only with ZEND_MODULE_API_NO >= 20010901 -+ would break older builds otherwise -+ */ - - /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. - Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ -@@ -236,7 +247,9 @@ - /* {{{ pdf_module_entry - */ - zend_module_entry pdf_module_entry = { -+#if ZEND_MODULE_API_NO >= 20010901 - STANDARD_MODULE_HEADER, -+#endif - "pdf", - pdf_functions, - PHP_MINIT(pdf), -@@ -244,7 +257,9 @@ - NULL, - NULL, - PHP_MINFO(pdf), -+#if ZEND_MODULE_API_NO >= 20010901 - NO_VERSION_YET, -+#endif - STANDARD_MODULE_PROPERTIES - }; - /* }}} */ -@@ -255,14 +270,10 @@ - - /* {{{ _free_pdf_doc - */ --static void _free_pdf_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+static void _free_pdf_doc(zend_rsrc_list_entry *rsrc) - { -- /* RJS: TODO: - PDF *pdf = (PDF *)rsrc->ptr; -- check whether pdf-Pointer is still valid, before pdf_delete() -- + remove php-resource */ -- /* PDF_delete(pdf); --*/ -+ PDF_delete(pdf); - } - /* }}} */ - -@@ -327,9 +338,14 @@ - */ - static size_t pdf_flushwrite(PDF *p, void *data, size_t size) - { -+#if ZEND_MODULE_API_NO >= 20010901 - TSRMLS_FETCH(); - - return(php_write(data, size TSRMLS_CC)); -+#else -+ return(php_write(data, size)); -+#endif -+ return 0; - } - /* }}} */ - -@@ -349,7 +365,7 @@ - #else - php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); - #endif -- php_info_print_table_row(2, "Revision", "$Revision$" ); -+ php_info_print_table_row(2, "Revision", "$Revision$" ); - php_info_print_table_end(); - - } -@@ -402,7 +418,7 @@ - - /* {{{ proto bool pdf_set_info(int pdfdoc, string fieldname, string value) - Fills an info field of the document */ --PHP_FUNCTION(pdf_set_info) -+PHP_FUNCTION(pdf_set_info) - { - zval **arg1, **arg2, **arg3; - PDF *pdf; -@@ -447,7 +463,7 @@ - - /* {{{ proto bool pdf_set_info_author(int pdfdoc, string author) - Fills the author field of the document */ --PHP_FUNCTION(pdf_set_info_author) -+PHP_FUNCTION(pdf_set_info_author) - { - _php_pdf_set_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, "Author"); - } -@@ -463,7 +479,7 @@ - - /* {{{ proto int pdf_open([int filedesc]) - Opens a new pdf document. If filedesc is NULL, document is created in memory. This is the old interface, only for compatibility use pdf_new + pdf_open_file instead */ --PHP_FUNCTION(pdf_open) -+PHP_FUNCTION(pdf_open) - { - zval **file; - FILE *fp; -@@ -498,7 +514,7 @@ - - /* {{{ proto void pdf_close(int pdfdoc) - Closes the pdf document */ --PHP_FUNCTION(pdf_close) -+PHP_FUNCTION(pdf_close) - { - zval **arg1; - PDF *pdf; -@@ -516,9 +532,9 @@ - - /* }}} */ - --/* {{{ proto void pdf_begin_page(int pdfdoc, double width, double height) -+/* {{{ proto void pdf_begin_page(int pdfdoc, float width, float height) - Starts page */ --PHP_FUNCTION(pdf_begin_page) -+PHP_FUNCTION(pdf_begin_page) - { - zval **arg1, **arg2, **arg3; - PDF *pdf; -@@ -538,7 +554,7 @@ - - /* {{{ proto void pdf_end_page(int pdfdoc) - Ends page */ --PHP_FUNCTION(pdf_end_page) -+PHP_FUNCTION(pdf_end_page) - { - zval **arg1; - PDF *pdf; -@@ -556,7 +572,7 @@ - - /* {{{ proto void pdf_show(int pdfdoc, string text) - Output text at current position */ --PHP_FUNCTION(pdf_show) -+PHP_FUNCTION(pdf_show) - { - zval **arg1, **arg2; - PDF *pdf; -@@ -573,9 +589,9 @@ - } - /* }}} */ - --/* {{{ proto void pdf_show_xy(int pdfdoc, string text, double x-koor, double y-koor) -+/* {{{ proto void pdf_show_xy(int pdfdoc, string text, float x_koor, float y_koor) - Output text at position */ --PHP_FUNCTION(pdf_show_xy) -+PHP_FUNCTION(pdf_show_xy) - { - zval **arg1, **arg2, **arg3, **arg4; - PDF *pdf; -@@ -594,9 +610,9 @@ - } - /* }}} */ - --/* {{{ proto int pdf_show_boxed(int pdfdoc, string text, double x-koor, double y-koor, double width, double height, string mode [, string feature]) -+/* {{{ proto int pdf_show_boxed(int pdfdoc, string text, float x_koor, float y_koor, float width, float height, string mode [, string feature]) - Output text formated in a boxed */ --PHP_FUNCTION(pdf_show_boxed) -+PHP_FUNCTION(pdf_show_boxed) - { - zval **argv[8]; - int argc = ZEND_NUM_ARGS(); -@@ -636,9 +652,9 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_font(int pdfdoc, string font, double size, string encoding [, int embed]) -+/* {{{ proto void pdf_set_font(int pdfdoc, string font, float size, string encoding [, int embed]) - Select the current font face, size and encoding */ --PHP_FUNCTION(pdf_set_font) -+PHP_FUNCTION(pdf_set_font) - { - zval **arg1, **arg2, **arg3, **arg4, **arg5; - int font, embed; -@@ -699,7 +715,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_value(int pdfdoc, string key, double value) -+/* {{{ proto void pdf_set_value(int pdfdoc, string key, float value) - Sets arbitrary value */ - PHP_FUNCTION(pdf_set_value) - { -@@ -720,7 +736,7 @@ - } - /* }}} */ - --/* {{{ proto double pdf_get_value(int pdfdoc, string key, double modifier) -+/* {{{ proto float pdf_get_value(int pdfdoc, string key, float modifier) - Gets arbitrary value */ - PHP_FUNCTION(pdf_get_value) - { -@@ -751,6 +767,15 @@ - } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "resy"))) { - if(argc < 3) WRONG_PARAM_COUNT; - value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_IMAGE_OFFSET); -+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "capheight"))) { -+ if(argc < 3) WRONG_PARAM_COUNT; -+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET); -+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "ascender"))) { -+ if(argc < 3) WRONG_PARAM_COUNT; -+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET); -+ } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "descender"))) { -+ if(argc < 3) WRONG_PARAM_COUNT; -+ value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), (float)Z_DVAL_PP(argv[2])-PDFLIB_FONT_OFFSET); - } else if(0 == (strcmp(Z_STRVAL_PP(argv[1]), "font"))) { - value = PDF_get_value(pdf, Z_STRVAL_PP(argv[1]), 0.0)+PDFLIB_FONT_OFFSET; - } else { -@@ -803,7 +828,7 @@ - } - /* }}} */ - --/* {{{ proto double pdf_get_fontsize(int pdfdoc) -+/* {{{ proto float pdf_get_fontsize(int pdfdoc) - Gets the current font size */ - PHP_FUNCTION(pdf_get_fontsize) - { -@@ -822,7 +847,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_leading(int pdfdoc, double distance) -+/* {{{ proto void pdf_set_leading(int pdfdoc, float distance) - Sets distance between text lines */ - PHP_FUNCTION(pdf_set_leading) - { -@@ -838,7 +863,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, double scale) -+/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, float scale) - Sets horizontal scaling of text */ - PHP_FUNCTION(pdf_set_horiz_scaling) - { -@@ -846,7 +871,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_text_rise(int pdfdoc, double value) -+/* {{{ proto void pdf_set_text_rise(int pdfdoc, float value) - Sets the text rise */ - PHP_FUNCTION(pdf_set_text_rise) - { -@@ -854,7 +879,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_char_spacing(int pdfdoc, double space) -+/* {{{ proto void pdf_set_char_spacing(int pdfdoc, float space) - Sets character spacing */ - PHP_FUNCTION(pdf_set_char_spacing) - { -@@ -862,7 +887,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_word_spacing(int pdfdoc, double space) -+/* {{{ proto void pdf_set_word_spacing(int pdfdoc, float space) - Sets spacing between words */ - PHP_FUNCTION(pdf_set_word_spacing) - { -@@ -870,7 +895,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y) -+/* {{{ proto void pdf_set_text_pos(int pdfdoc, float x, float y) - Sets the position of text for the next pdf_show call */ - PHP_FUNCTION(pdf_set_text_pos) - { -@@ -909,7 +934,7 @@ - } - /* }}} */ - --/* {{{ proto double pdf_stringwidth(int pdfdoc, string text [, int font, double size]) -+/* {{{ proto float pdf_stringwidth(int pdfdoc, string text [, int font, float size]) - Returns width of text in current font */ - PHP_FUNCTION(pdf_stringwidth) - { -@@ -990,7 +1015,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_translate(int pdfdoc, double x, double y) -+/* {{{ proto void pdf_translate(int pdfdoc, float x, float y) - Sets origin of coordinate system */ - PHP_FUNCTION(pdf_translate) - { -@@ -1010,7 +1035,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_scale(int pdfdoc, double x-scale, double y-scale) -+/* {{{ proto void pdf_scale(int pdfdoc, float x_scale, float y_scale) - Sets scaling */ - PHP_FUNCTION(pdf_scale) - { -@@ -1030,7 +1055,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_rotate(int pdfdoc, double angle) -+/* {{{ proto void pdf_rotate(int pdfdoc, float angle) - Sets rotation */ - PHP_FUNCTION(pdf_rotate) - { -@@ -1049,7 +1074,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_skew(int pdfdoc, double xangle, double yangle) -+/* {{{ proto void pdf_skew(int pdfdoc, float xangle, float yangle) - Skew the coordinate system */ - PHP_FUNCTION(pdf_skew) - { -@@ -1069,7 +1094,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setflat(int pdfdoc, double value) -+/* {{{ proto void pdf_setflat(int pdfdoc, float value) - Sets flatness */ - PHP_FUNCTION(pdf_setflat) - { -@@ -1147,7 +1172,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setmiterlimit(int pdfdoc, double value) -+/* {{{ proto void pdf_setmiterlimit(int pdfdoc, float value) - Sets miter limit */ - PHP_FUNCTION(pdf_setmiterlimit) - { -@@ -1173,7 +1198,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setlinewidth(int pdfdoc, double width) -+/* {{{ proto void pdf_setlinewidth(int pdfdoc, float width) - Sets line width */ - PHP_FUNCTION(pdf_setlinewidth) - { -@@ -1192,7 +1217,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setdash(int pdfdoc, double black, double white) -+/* {{{ proto void pdf_setdash(int pdfdoc, float black, float white) - Sets dash pattern */ - PHP_FUNCTION(pdf_setdash) - { -@@ -1212,7 +1237,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_moveto(int pdfdoc, double x, double y) -+/* {{{ proto void pdf_moveto(int pdfdoc, float x, float y) - Sets current point */ - PHP_FUNCTION(pdf_moveto) - { -@@ -1232,7 +1257,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_curveto(int pdfdoc, double x1, double y1, double x2, double y2, double x3, double y3) -+/* {{{ proto void pdf_curveto(int pdfdoc, float x1, float y1, float x2, float y2, float x3, float y3) - Draws a curve */ - PHP_FUNCTION(pdf_curveto) - { -@@ -1263,7 +1288,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_lineto(int pdfdoc, double x, double y) -+/* {{{ proto void pdf_lineto(int pdfdoc, float x, float y) - Draws a line */ - PHP_FUNCTION(pdf_lineto) - { -@@ -1283,7 +1308,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_circle(int pdfdoc, double x, double y, double radius) -+/* {{{ proto void pdf_circle(int pdfdoc, float x, float y, float radius) - Draws a circle */ - PHP_FUNCTION(pdf_circle) - { -@@ -1304,7 +1329,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_arc(int pdfdoc, double x, double y, double radius, double start, double end) -+/* {{{ proto void pdf_arc(int pdfdoc, float x, float y, float radius, float start, float end) - Draws an arc */ - PHP_FUNCTION(pdf_arc) - { -@@ -1333,7 +1358,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_rect(int pdfdoc, double x, double y, double width, double height) -+/* {{{ proto void pdf_rect(int pdfdoc, float x, float y, float width, float height) - Draws a rectangle */ - PHP_FUNCTION(pdf_rect) - { -@@ -1552,7 +1577,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setgray_fill(int pdfdoc, double value) -+/* {{{ proto void pdf_setgray_fill(int pdfdoc, float value) - Sets filling color to gray value */ - PHP_FUNCTION(pdf_setgray_fill) - { -@@ -1575,7 +1600,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setgray_stroke(int pdfdoc, double value) -+/* {{{ proto void pdf_setgray_stroke(int pdfdoc, float value) - Sets drawing color to gray value */ - PHP_FUNCTION(pdf_setgray_stroke) - { -@@ -1598,7 +1623,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setgray(int pdfdoc, double value) -+/* {{{ proto void pdf_setgray(int pdfdoc, float value) - Sets drawing and filling color to gray value */ - PHP_FUNCTION(pdf_setgray) - { -@@ -1621,7 +1646,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue) -+/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, float red, float green, float blue) - Sets filling color to RGB color value */ - PHP_FUNCTION(pdf_setrgbcolor_fill) - { -@@ -1646,7 +1671,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue) -+/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, float red, float green, float blue) - Sets drawing color to RGB color value */ - PHP_FUNCTION(pdf_setrgbcolor_stroke) - { -@@ -1671,7 +1696,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue) -+/* {{{ proto void pdf_setrgbcolor(int pdfdoc, float red, float green, float blue) - Sets drawing and filling color to RGB color value */ - PHP_FUNCTION(pdf_setrgbcolor) - { -@@ -1798,7 +1823,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_duration(int pdfdoc, double duration) -+/* {{{ proto void pdf_set_duration(int pdfdoc, float duration) - Sets duration between pages */ - PHP_FUNCTION(pdf_set_duration) - { -@@ -1835,7 +1860,11 @@ - convert_to_string_ex(arg2); - - #ifdef VIRTUAL_DIR -+# if ZEND_MODULE_API_NO >= 20010901 - virtual_filepath(Z_STRVAL_PP(arg2), &image TSRMLS_CC); -+# else -+ virtual_filepath(Z_STRVAL_PP(arg2), &image); -+# endif - #else - image = Z_STRVAL_PP(arg2); - #endif -@@ -1908,7 +1937,11 @@ - convert_to_string_ex(arg3); - - #ifdef VIRTUAL_DIR -+# if ZEND_MODULE_API_NO >= 20010901 - virtual_filepath(Z_STRVAL_PP(arg3), &image TSRMLS_CC); -+# else -+ virtual_filepath(Z_STRVAL_PP(arg3), &image); -+# endif - #else - image = Z_STRVAL_PP(arg3); - #endif -@@ -2013,7 +2046,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_place_image(int pdf, int pdfimage, double x, double y, double scale) -+/* {{{ proto void pdf_place_image(int pdf, int pdfimage, float x, float y, float scale) - Places image in the PDF document */ - PHP_FUNCTION(pdf_place_image) - { -@@ -2076,7 +2109,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_weblink(int pdfdoc, double llx, double lly, double urx, double ury, string url) -+/* {{{ proto void pdf_add_weblink(int pdfdoc, float llx, float lly, float urx, float ury, string url) - Adds link to web resource */ - PHP_FUNCTION(pdf_add_weblink) - { -@@ -2103,7 +2136,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_pdflink(int pdfdoc, double llx, double lly, double urx, double ury, string filename, int page, string dest) -+/* {{{ proto void pdf_add_pdflink(int pdfdoc, float llx, float lly, float urx, float ury, string filename, int page, string dest) - Adds link to PDF document */ - PHP_FUNCTION(pdf_add_pdflink) - { -@@ -2135,7 +2168,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_border_style(int pdfdoc, string style, double width) -+/* {{{ proto void pdf_set_border_style(int pdfdoc, string style, float width) - Sets style of box surounding all kinds of annotations and link */ - PHP_FUNCTION(pdf_set_border_style) - { -@@ -2155,7 +2188,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_border_color(int pdfdoc, double red, double green, double blue) -+/* {{{ proto void pdf_set_border_color(int pdfdoc, float red, float green, float blue) - Sets color of box surounded all kinds of annotations and links */ - PHP_FUNCTION(pdf_set_border_color) - { -@@ -2176,7 +2209,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_set_border_dash(int pdfdoc, double black, double white) -+/* {{{ proto void pdf_set_border_dash(int pdfdoc, float black, float white) - Sets the border dash style of all kinds of annotations and links */ - PHP_FUNCTION(pdf_set_border_dash) - { -@@ -2196,7 +2229,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_annotation(int pdfdoc, double xll, double yll, double xur, double xur, string title, string text) -+/* {{{ proto void pdf_add_annotation(int pdfdoc, float xll, float yll, float xur, float xur, string title, string text) - Sets annotation (depreciated use pdf_add_note instead) */ - PHP_FUNCTION(pdf_add_annotation) - { -@@ -2247,7 +2280,7 @@ - - /* }}} */ - --/* {{{ proto void pdf_delete(int pdfdoc) -+/* {{{ proto bool pdf_delete(int pdfdoc) - Deletes the PDF object */ - PHP_FUNCTION(pdf_delete) - { -@@ -2260,8 +2293,11 @@ - - ZEND_FETCH_RESOURCE(pdf, PDF *, arg1, -1, "pdf object", le_pdf); - -- PDF_delete(pdf); -- zend_list_delete(Z_LVAL_PP(arg1)); -+#ifndef Z_RESVAL /* for php 4.0.3pl1 */ -+#define Z_RESVAL(zval) (zval).value.lval -+#define Z_RESVAL_PP(zval_pp) Z_RESVAL(**zval_pp) -+#endif -+ zend_list_delete(Z_RESVAL_PP(arg1)); - - RETURN_TRUE; - } -@@ -2406,7 +2442,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setpolydash(int pdfdoc, double darray) -+/* {{{ proto void pdf_setpolydash(int pdfdoc, float darray) - Sets more complicated dash pattern */ - - PHP_FUNCTION(pdf_setpolydash) -@@ -2436,10 +2472,10 @@ - - zend_hash_get_current_data(array, (void **) &keydataptr); - keydata = *keydataptr; -- if (keydata->type == IS_DOUBLE) { -- darray[i] = (float) keydata->value.dval; -- } else if (keydata->type == IS_LONG) { -- darray[i] = (float) keydata->value.lval; -+ if (Z_TYPE_P(keydata) == IS_DOUBLE) { -+ darray[i] = (float) Z_DVAL_P(keydata); -+ } else if (Z_TYPE_P(keydata) == IS_LONG) { -+ darray[i] = (float) Z_LVAL_P(keydata); - } else { - php_error(E_WARNING,"PDFlib set_polydash: illegal darray value"); - } -@@ -2453,7 +2489,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_concat(int pdf, double a, double b, double c, double d, double e, double f) -+/* {{{ proto void pdf_concat(int pdf, float a, float b, float c, float d, float e, float f) - Concatenates a matrix to the current transformation matrix for text and graphics */ - PHP_FUNCTION(pdf_concat) - { -@@ -2502,7 +2538,11 @@ - - convert_to_string_ex(arg2); - #ifdef VIRTUAL_DIR -+# if ZEND_MODULE_API_NO >= 20010901 - virtual_filepath(Z_STRVAL_PP(arg2), &image TSRMLS_CC); -+# else -+ virtual_filepath(Z_STRVAL_PP(arg2), &image); -+# endif - #else - image = Z_STRVAL_PP(arg2); - #endif -@@ -2551,7 +2591,11 @@ - convert_to_string_ex(arg10); - - #ifdef VIRTUAL_DIR -+# if ZEND_MODULE_API_NO >= 20010901 - virtual_filepath(Z_STRVAL_PP(arg4), &image TSRMLS_CC); -+# else -+ virtual_filepath(Z_STRVAL_PP(arg4), &image); -+# endif - #else - image = Z_STRVAL_PP(arg4); - #endif -@@ -2571,7 +2615,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_attach_file(int pdf, double lly, double lly, double urx, double ury, string filename, string description, string author, string mimetype, string icon) -+/* {{{ proto void pdf_attach_file(int pdf, float lly, float lly, float urx, float ury, string filename, string description, string author, string mimetype, string icon) - Adds a file attachment annotation at the rectangle specified by his lower left and upper right corners */ - PHP_FUNCTION(pdf_attach_file) - { -@@ -2609,7 +2653,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_note(int pdfdoc, double llx, double lly, double urx, double ury, string contents, string title, string icon, int open) -+/* {{{ proto void pdf_add_note(int pdfdoc, float llx, float lly, float urx, float ury, string contents, string title, string icon, int open) - Sets annotation */ - PHP_FUNCTION(pdf_add_note) - { -@@ -2645,7 +2689,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_locallink(int pdfdoc, double llx, double lly, double urx, double ury, int page, string dest) -+/* {{{ proto void pdf_add_locallink(int pdfdoc, float llx, float lly, float urx, float ury, int page, string dest) - Adds link to web resource */ - PHP_FUNCTION(pdf_add_locallink) - { -@@ -2677,7 +2721,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_add_launchlink(int pdfdoc, double llx, double lly, double urx, double ury, string filename) -+/* {{{ proto void pdf_add_launchlink(int pdfdoc, float llx, float lly, float urx, float ury, string filename) - Adds link to web resource */ - PHP_FUNCTION(pdf_add_launchlink) - { -@@ -2729,7 +2773,11 @@ - convert_to_long_ex(arg4); - - #ifdef VIRTUAL_DIR -+# if ZEND_MODULE_API_NO >= 20010901 - virtual_filepath(Z_STRVAL_PP(arg2), &file TSRMLS_CC); -+# else -+ virtual_filepath(Z_STRVAL_PP(arg2), &file); -+# endif - #else - file = Z_STRVAL_PP(arg2); - #endif -@@ -2792,7 +2840,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_place_pdi_page(int pdf, int page, double x, double y, double sx, double sy) -+/* {{{ proto void pdf_place_pdi_page(int pdf, int page, float x, float y, float sx, float sy) - * Place a PDF page with the lower left corner at (x, y), and scale it. */ - PHP_FUNCTION(pdf_place_pdi_page) - { -@@ -2875,7 +2923,7 @@ - } - /* }}} */ - --/* {{{ proto double pdf_get_pdi_value(int pdf, string key, int doc, int page, int index); -+/* {{{ proto float pdf_get_pdi_value(int pdf, string key, int doc, int page, int index); - * Get the contents of some PDI document parameter with numerical type. */ - PHP_FUNCTION(pdf_get_pdi_value) - { -@@ -2904,7 +2952,7 @@ - } - /* }}} */ - --/* {{{ proto int pdf_begin_pattern(int pdf, double width, double height, double xstep, double ystep, int painttype); -+/* {{{ proto int pdf_begin_pattern(int pdf, float width, float height, float xstep, float ystep, int painttype); - * Start a new pattern definition. */ - PHP_FUNCTION(pdf_begin_pattern) - { -@@ -2954,7 +3002,7 @@ - } - /* }}} */ - --/* {{{ proto int pdf_begin_template(int pdf, double width, double height); -+/* {{{ proto int pdf_begin_template(int pdf, float width, float height); - * Start a new template definition. */ - PHP_FUNCTION(pdf_begin_template) - { -@@ -2999,7 +3047,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setcolor(int pdf, string type, string colorspace, double c1 [, double c2 [, double c3 [, double c4]]]); -+/* {{{ proto void pdf_setcolor(int pdf, string type, string colorspace, float c1 [, float c2 [, float c3 [, float c4]]]); - * Set the current color space and color. */ - PHP_FUNCTION(pdf_setcolor) - { -@@ -3087,7 +3135,7 @@ - } - /* }}} */ - --/* {{{ proto void pdf_arcn(int pdf, double x, double y, double r, double alpha, double beta); -+/* {{{ proto void pdf_arcn(int pdf, float x, float y, float r, float alpha, float beta); - * Draw a clockwise circular arc from alpha to beta degrees. */ - PHP_FUNCTION(pdf_arcn) - { -@@ -3158,10 +3206,10 @@ - } - /* }}} */ - --/* {{{ proto void pdf_setmatrix(int pdf, double a, double b, double c, double d, double e, double f) -+/* {{{ proto void pdf_setmatrix(int pdf, float a, float b, float c, float d, float e, float f) - Explicitly set the current transformation matrix. */ - PHP_FUNCTION(pdf_setmatrix) --{ -+{ - zval **arg1, **arg2, **arg3, **arg4, **arg5, **arg6, **arg7; - PDF *pdf; - -@@ -3189,6 +3237,7 @@ - RETURN_TRUE; - } - /* }}} */ -+ - #endif /* PDFlib >= V4 */ - - #endif -@@ -3198,6 +3247,6 @@ - * tab-width: 4 - * c-basic-offset: 4 - * End: -- * vim600: sw=4 ts=4 tw=78 fdm=marker -- * vim<600: sw=4 ts=4 tw=78 -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 - */ ---- php-4.1.2/ext/pdf/php_pdf.h.wiget Tue Aug 7 19:26:32 2001 -+++ php-4.1.2/ext/pdf/php_pdf.h Mon Dec 3 21:53:06 2001 -@@ -16,17 +16,15 @@ - +----------------------------------------------------------------------+ - */ - --/* $Id$ */ -+/* $Id$ */ -+/* Derived from: -+ Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */ - - #ifndef PHP_PDF_H - #define PHP_PDF_H - - #if HAVE_PDFLIB - --/* with version 2.20 of pdflib PDF_open_mem isn't available unless -- the following define isn't there. --*/ --#define PDF_OPEN_MEM_SUPPORTED - #include - - extern zend_module_entry pdf_module_entry; diff --git a/php-pear-install.patch b/php-pear-install.patch deleted file mode 100644 index f46571d..0000000 --- a/php-pear-install.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- php/pear/php.ini.orig Wed Jun 18 14:11:24 2003 -+++ php/pear/php.ini Wed Jun 18 14:04:21 2003 -@@ -0,0 +1,2 @@ -+extension_dir=modules -+extension=pcre.so ---- php/pear/Makefile.frag.orig Wed Jun 18 14:15:02 2003 -+++ php/pear/Makefile.frag Wed Jun 18 14:15:07 2003 -@@ -3,7 +3,7 @@ - peardir=$(PEAR_INSTALLDIR) - - # Skip all php.ini files altogether --PEAR_INSTALL_FLAGS = -n -dsafe_mode=0 -+PEAR_INSTALL_FLAGS = -c $(top_builddir)/pear -dsafe_mode=0 - - install-pear-installer: $(top_builddir)/sapi/cli/php - @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/package-*.xml diff --git a/php-pearinstall.patch b/php-pearinstall.patch deleted file mode 100644 index 471bee9..0000000 --- a/php-pearinstall.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- php-4.0.6/configure.in.pear Mon Jul 9 12:11:47 2001 -+++ php-4.0.6/configure.in Mon Jul 9 12:19:09 2001 -@@ -501,13 +501,14 @@ - - if test "x$PHP_PEAR" != "xno"; then - PEAR_DIR=pear --fi -- --if test "x$PHP_PEAR" = "xDEFAULT"; then -- case $PHP_LAYOUT in -- GNU) PEAR_INSTALLDIR="$datadir/pear";; -- *) PEAR_INSTALLDIR="$libdir/php";; -- esac -+ if test "x$PHP_PEAR" = "xDEFAULT" -o "x$PHP_PEAR" = "xyes" ; then -+ case $PHP_LAYOUT in -+ GNU) PEAR_INSTALLDIR="$datadir/pear";; -+ *) PEAR_INSTALLDIR="$libdir/php";; -+ esac -+ else -+ PEAR_INSTALLDIR="$PHP_PEAR" -+ fi - fi - - test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" diff --git a/php-pldlogo.patch b/php-pldlogo.patch deleted file mode 100644 index 913be92..0000000 --- a/php-pldlogo.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- php-4.3.0/ext/standard/info.c.orig Thu Nov 14 22:17:00 2002 -+++ php-4.3.0/ext/standard/info.c Thu Jan 2 12:19:36 2003 -@@ -478,6 +478,21 @@ - PUTS(PG(html_errors)?"
":"\n"); - PUTS(zend_version); - php_info_print_box_end(); -+ /* PLD Linux */ -+ php_info_print_box_start(0); -+ if (expose_php && PG(html_errors)) { -+ PUTS("\"PLD\n"); -+ } -+ PUTS("This server is using PLD Linux."); -+ if (PG(html_errors)) -+ PUTS("
More information at http://www.pld-linux.org/.
\n"); -+ else -+ PUTS("\nMore information at http://www.pld-linux.org/.\n"); -+ php_info_print_box_end(); - efree(php_uname); - } - -diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h ---- php-4.2.1RC2.org/ext/standard/info.h Sat May 11 20:49:24 2002 -+++ php-4.2.1RC2/ext/standard/info.h Sat May 11 20:49:40 2002 -@@ -54,6 +54,7 @@ - #define PHP_EGG_LOGO_GUID "PHPE9568F36-D428-11d2-A769-00AA001ACF42" - #define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42" - #define PHP_CREDITS_GUID "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000" -+#define PLD_LOGO_GUID "PHPE9568F40-D428-11d2-A769-00AA001ACF42" - - PHP_FUNCTION(phpversion); - PHP_FUNCTION(phpinfo); ---- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002 -+++ php-4.3.0/main/logos.h Sat May 11 20:50:32 2002 -@@ -1503,1 +1503,127 @@ - 249, 249, 207, 233, 5, 4, 0, 59 }; -+ -+ -+unsigned char pld_logo[] = { -+ 137, 80, 78, 71, 13, 10, 26, 10, 0, 0, -+ 0, 13, 73, 72, 68, 82, 0, 0, 0, 80, -+ 0, 0, 0, 50, 8, 3, 0, 0, 0, 252, -+ 243, 172, 206, 0, 0, 2, 46, 80, 76, 84, -+ 69, 192, 192, 192, 0, 0, 99, 0, 0, 97, -+ 0, 0, 96, 0, 0, 95, 0, 0, 94, 0, -+ 0, 93, 0, 0, 91, 2, 2, 98, 6, 6, -+ 102, 6, 6, 101, 11, 11, 101, 14, 14, 111, -+ 15, 15, 103, 16, 16, 107, 21, 21, 111, 26, -+ 26, 111, 27, 27, 112, 28, 28, 115, 27, 27, -+ 109, 29, 29, 114, 30, 30, 114, 31, 31, 115, -+ 34, 34, 119, 36, 36, 120, 35, 35, 117, 36, -+ 36, 119, 36, 36, 117, 38, 38, 120, 40, 40, -+ 121, 42, 42, 123, 42, 42, 122, 41, 41, 118, -+ 42, 42, 120, 44, 44, 125, 47, 47, 128, 46, -+ 46, 120, 49, 49, 124, 53, 53, 130, 55, 55, -+ 133, 59, 59, 133, 63, 63, 138, 61, 61, 134, -+ 60, 60, 131, 58, 58, 125, 64, 64, 137, 63, -+ 63, 135, 60, 60, 129, 61, 61, 129, 65, 65, -+ 135, 67, 67, 138, 64, 64, 131, 69, 69, 140, -+ 71, 71, 141, 70, 70, 139, 70, 70, 137, 70, -+ 70, 136, 71, 71, 137, 68, 68, 131, 76, 76, -+ 142, 79, 79, 146, 78, 78, 143, 79, 79, 144, -+ 79, 79, 143, 74, 74, 134, 74, 74, 133, 83, -+ 83, 147, 89, 89, 154, 82, 82, 141, 90, 90, -+ 154, 90, 90, 153, 88, 88, 150, 91, 91, 153, -+ 90, 90, 151, 93, 93, 152, 98, 98, 159, 96, -+ 96, 156, 91, 91, 148, 96, 96, 155, 94, 94, -+ 152, 88, 88, 142, 89, 89, 143, 100, 100, 160, -+ 93, 93, 147, 103, 103, 162, 101, 101, 159, 92, -+ 92, 144, 96, 96, 149, 106, 106, 164, 98, 98, -+ 152, 96, 96, 148, 108, 108, 165, 106, 106, 162, -+ 101, 101, 154, 102, 102, 155, 103, 103, 156, 111, -+ 111, 167, 103, 103, 155, 112, 112, 167, 104, 104, -+ 155, 112, 112, 164, 116, 116, 168, 109, 109, 156, -+ 118, 118, 168, 127, 127, 177, 125, 125, 174, 125, -+ 125, 173, 111, 111, 154, 127, 127, 175, 124, 124, -+ 171, 128, 128, 176, 137, 137, 184, 137, 137, 183, -+ 128, 128, 171, 125, 125, 166, 140, 140, 185, 126, -+ 126, 167, 137, 137, 180, 143, 143, 185, 141, 141, -+ 183, 146, 146, 188, 144, 144, 185, 148, 148, 189, -+ 138, 138, 175, 137, 137, 174, 148, 148, 187, 149, -+ 149, 185, 158, 158, 195, 157, 157, 193, 153, 153, -+ 187, 164, 164, 199, 166, 166, 201, 165, 165, 200, -+ 156, 156, 188, 155, 155, 187, 160, 160, 192, 171, -+ 171, 204, 169, 169, 202, 170, 170, 202, 177, 177, -+ 209, 158, 158, 187, 174, 174, 205, 166, 166, 195, -+ 173, 173, 203, 173, 173, 202, 169, 169, 197, 167, -+ 167, 194, 168, 168, 194, 184, 184, 212, 173, 173, -+ 198, 187, 187, 213, 185, 185, 210, 183, 183, 208, -+ 189, 189, 214, 194, 194, 218, 189, 189, 213, 184, -+ 184, 207, 183, 183, 206, 195, 195, 218, 199, 199, -+ 222, 200, 200, 222, 196, 196, 217, 198, 198, 218, -+ 194, 194, 214, 188, 188, 207, 204, 204, 224, 197, -+ 197, 215, 209, 209, 227, 208, 208, 226, 207, 207, -+ 225, 206, 206, 224, 205, 205, 223, 208, 208, 225, -+ 205, 205, 222, 196, 196, 212, 211, 211, 227, 206, -+ 206, 222, 213, 213, 229, 209, 209, 224, 216, 216, -+ 231, 212, 212, 227, 202, 202, 216, 219, 219, 233, -+ 217, 217, 231, 204, 204, 217, 226, 226, 235, 152, -+ 38, 201, 129, 0, 0, 0, 1, 116, 82, 78, -+ 83, 0, 64, 230, 216, 102, 0, 0, 0, 1, -+ 98, 75, 71, 68, 185, 58, 184, 22, 96, 0, -+ 0, 2, 57, 73, 68, 65, 84, 120, 218, 99, -+ 96, 24, 156, 32, 195, 207, 92, 180, 159, 138, -+ 230, 21, 123, 173, 101, 8, 148, 164, 158, 121, -+ 249, 210, 64, 98, 134, 10, 245, 12, 228, 9, -+ 3, 18, 157, 217, 212, 51, 16, 236, 217, 164, -+ 30, 170, 153, 167, 92, 2, 36, 58, 100, 168, -+ 102, 158, 115, 20, 136, 204, 76, 161, 150, 121, -+ 221, 198, 32, 114, 150, 236, 60, 106, 25, 40, -+ 54, 29, 68, 26, 53, 80, 203, 60, 241, 62, -+ 16, 25, 212, 70, 45, 243, 52, 107, 64, 100, -+ 179, 22, 181, 204, 155, 239, 2, 166, 148, 106, -+ 169, 101, 160, 4, 152, 76, 42, 164, 150, 121, -+ 222, 213, 96, 202, 140, 90, 230, 109, 115, 7, -+ 83, 174, 147, 168, 101, 96, 197, 22, 16, 57, -+ 197, 2, 72, 180, 80, 197, 192, 157, 96, 82, -+ 61, 145, 129, 97, 38, 187, 19, 181, 92, 201, -+ 16, 193, 217, 10, 36, 125, 217, 52, 168, 100, -+ 222, 10, 249, 180, 34, 16, 29, 206, 42, 69, -+ 29, 3, 155, 96, 229, 106, 48, 155, 53, 85, -+ 12, 12, 113, 128, 177, 84, 89, 230, 82, 195, -+ 192, 232, 0, 24, 107, 29, 179, 28, 53, 12, -+ 76, 48, 128, 51, 35, 89, 167, 82, 193, 192, -+ 82, 94, 4, 155, 195, 146, 10, 6, 78, 96, -+ 222, 1, 103, 219, 50, 81, 195, 207, 76, 241, -+ 112, 230, 68, 150, 201, 84, 48, 208, 159, 101, -+ 25, 156, 205, 149, 76, 13, 39, 10, 240, 65, -+ 25, 11, 54, 120, 10, 18, 171, 137, 17, 78, -+ 96, 130, 173, 220, 252, 43, 193, 140, 133, 113, -+ 237, 28, 32, 101, 64, 64, 145, 129, 12, 12, -+ 142, 58, 149, 27, 65, 180, 97, 163, 16, 84, -+ 25, 65, 19, 241, 27, 8, 4, 75, 64, 68, -+ 110, 172, 30, 220, 64, 176, 51, 17, 8, 76, -+ 65, 25, 112, 63, 48, 194, 20, 97, 49, 122, -+ 209, 108, 32, 177, 88, 209, 30, 102, 32, 212, -+ 84, 168, 129, 16, 2, 137, 135, 112, 33, 92, -+ 4, 13, 212, 167, 130, 72, 17, 109, 152, 189, -+ 48, 3, 161, 16, 46, 132, 144, 35, 96, 96, -+ 153, 9, 136, 180, 211, 71, 87, 11, 119, 24, -+ 3, 134, 57, 248, 13, 172, 50, 5, 145, 233, -+ 10, 240, 240, 96, 100, 100, 68, 210, 11, 115, -+ 24, 52, 104, 81, 194, 16, 123, 228, 116, 197, -+ 128, 200, 114, 97, 130, 233, 5, 103, 148, 163, -+ 129, 222, 80, 16, 57, 221, 138, 90, 230, 49, -+ 172, 206, 2, 83, 53, 100, 185, 16, 27, 88, -+ 227, 6, 166, 230, 64, 67, 134, 17, 150, 228, -+ 144, 248, 48, 247, 48, 34, 83, 56, 193, 52, -+ 31, 48, 181, 137, 1, 158, 118, 145, 12, 68, -+ 209, 79, 68, 190, 4, 129, 149, 57, 168, 78, -+ 64, 55, 16, 97, 14, 146, 11, 225, 110, 71, -+ 214, 2, 149, 223, 236, 65, 158, 129, 12, 8, -+ 67, 144, 19, 20, 3, 195, 246, 60, 178, 12, -+ 100, 192, 105, 224, 230, 2, 36, 3, 209, 35, -+ 133, 120, 3, 17, 202, 150, 235, 46, 69, 15, -+ 117, 202, 92, 184, 202, 6, 191, 129, 24, 177, -+ 140, 97, 32, 35, 170, 129, 12, 106, 29, 152, -+ 6, 50, 50, 162, 196, 37, 138, 48, 186, 79, -+ 81, 5, 25, 24, 214, 215, 17, 149, 186, 200, -+ 0, 0, 218, 35, 72, 230, 144, 1, 81, 42, -+ 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, -+ 96, 130 }; -diff -urN php-4.2.1RC2.org/main/php_logos.c php-4.2.1RC2/main/php_logos.c ---- php-4.2.1RC2.org/main/php_logos.c Sat May 11 20:49:24 2002 -+++ php-4.2.1RC2/main/php_logos.c Sat May 11 20:51:05 2002 -@@ -56,6 +56,7 @@ - php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); - php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); - php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); -+ php_register_info_logo(PLD_LOGO_GUID , "image/png", pld_logo , sizeof(pld_logo)); - - return SUCCESS; - } diff --git a/php-register_shutdown_function.patch b/php-register_shutdown_function.patch deleted file mode 100644 index 8a7b3ee..0000000 --- a/php-register_shutdown_function.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- php-4.1.1/sapi/apache/sapi_apache.c Sat Aug 4 21:42:45 2001 -+++ ../php-4.1.1-changed/php-4.1.1/sapi/apache/sapi_apache.c Thu Jan 24 -12:08:40 2002 -@@ -89,13 +89,13 @@ - - (void) php_execute_script(&file_handle TSRMLS_CC); - } -- -+/* - AP(in_request) = 0; - - zend_try { - php_request_shutdown(NULL); - } zend_end_try(); -- -+*/ - return (OK); - } - /* }}} */ diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch deleted file mode 100644 index 94ec009..0000000 --- a/php-sapi-ini-file.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- php-4.3.0/main/php_ini.c.orig Tue Nov 12 21:56:47 2002 -+++ php-4.3.0/main/php_ini.c Sat Jan 4 12:22:39 2003 -@@ -351,6 +351,22 @@ - } - } - } -+ /* Search (global) php.ini file in search path */ -+ if (!fh.handle.fp) { -+ fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC); -+ if (fh.handle.fp) { -+ fh.filename = php_ini_opened_path; -+ PG(safe_mode) = safe_mode_state; -+ PG(open_basedir) = open_basedir; -+ fh.type = ZEND_HANDLE_FP; -+ zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists); -+ safe_mode_state = PG(safe_mode); -+ open_basedir = PG(open_basedir); -+ PG(safe_mode) = 0; -+ PG(open_basedir) = NULL; -+ fh.handle.fp = NULL; -+ } -+ } - /* Search php-%sapi-module-name%.ini file in search path */ - if (!fh.handle.fp) { - const char *fmt = "php-%s.ini"; -@@ -361,13 +377,6 @@ - if (fh.handle.fp) { - fh.filename = php_ini_opened_path; - } -- } -- /* Search php.ini file in search path */ -- if (!fh.handle.fp) { -- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC); -- if (fh.handle.fp) { -- fh.filename = php_ini_opened_path; -- } - } - } - if (free_ini_search_path) { diff --git a/php-session-unregister.patch b/php-session-unregister.patch deleted file mode 100644 index 5a7b5d0..0000000 --- a/php-session-unregister.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- php-4.3.0/ext/session/php_session.h.orig Thu Oct 3 08:45:15 2002 -+++ php-4.3.0/ext/session/php_session.h Tue Jan 7 12:45:39 2003 -@@ -181,6 +181,7 @@ - int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC); - - PHPAPI int php_session_register_module(ps_module *); -+PHPAPI int php_session_unregister_module(const char *name); - - PHPAPI int php_session_register_serializer(const char *name, - int (*encode)(PS_SERIALIZER_ENCODE_ARGS), ---- php-4.3.0/ext/session/session.c.orig Thu Dec 5 21:42:05 2002 -+++ php-4.3.0/ext/session/session.c Tue Jan 7 12:45:38 2003 -@@ -208,12 +208,33 @@ - ps_modules[i] = ptr; - ret = 0; - break; -- } -+ } else if((ps_modules[i]->s_name != NULL) && (ptr->s_name != NULL) && -+ !strcasecmp(ps_modules[i]->s_name, ptr->s_name)) { -+ /* avoid double registration */ -+ ret = 0; -+ break; -+ } - } - - return ret; - } - -+PHPAPI int php_session_unregister_module(const char *name) -+{ -+ int ret = -1; -+ int i; -+ -+ for (i = 0; i < MAX_MODULES; i++) { -+ if (ps_modules[i] && ps_modules[i]->s_name && !strcasecmp(ps_modules[i]->s_name, name)) { -+ ps_modules[i] = 0; -+ ret = 0; -+ break; -+ } -+ } -+ -+ return ret; -+} -+ - PHP_MINIT_FUNCTION(session); - PHP_RINIT_FUNCTION(session); - PHP_MSHUTDOWN_FUNCTION(session); ---- php-4.3.0/ext/session/mod_mm.c.orig Thu Dec 5 21:42:05 2002 -+++ php-4.3.0/ext/session/mod_mm.c Tue Jan 7 12:46:21 2003 -@@ -291,6 +291,7 @@ - - PHP_MSHUTDOWN_FUNCTION(ps_mm) - { -+ php_session_unregister_module("mm"); - if (ps_mm_instance) { - ps_mm_destroy(ps_mm_instance); - return SUCCESS; ---- php-4.3.0/ext/msession/msession.c.orig Thu Aug 22 15:29:50 2002 -+++ php-4.3.0/ext/msession/msession.c Tue Jan 7 12:46:50 2003 -@@ -188,6 +188,9 @@ - - PHP_MSHUTDOWN_FUNCTION(msession) - { -+#ifdef HAVE_PHP_SESSION -+ php_session_unregister_module("msession"); -+#endif - return SUCCESS; - } - diff --git a/php-shared.patch b/php-shared.patch deleted file mode 100644 index ec81aae..0000000 --- a/php-shared.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- php-4.3.0/Makefile.global.orig Tue Nov 12 18:40:38 2002 -+++ php-4.3.0/Makefile.global Thu Jan 2 23:29:35 2003 -@@ -10,8 +10,11 @@ - - build-modules: $(PHP_MODULES) - --libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -+libphp_common.la: $(PHP_GLOBAL_OBJS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) -+ -+libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - - libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so -@@ -20,8 +23,17 @@ - - install-sapi: libphp4.la - @echo "Installing PHP SAPI module" -+ -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1 - -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1 - -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -+ -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \ -+ for i in 0.0.0 0.0 0; do \ -+ if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \ -+ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \ -+ break; \ -+ fi; \ -+ done; \ -+ fi - -@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 \ ---- php-4.3.0/sapi/cgi/Makefile.frag.orig Sun Sep 29 18:22:48 2002 -+++ php-4.3.0/sapi/cgi/Makefile.frag Thu Jan 2 23:33:29 2003 -@@ -1,2 +1,2 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS) - $(BUILD_CGI) ---- php-4.3.0/sapi/cli/Makefile.frag.orig Sun Sep 29 18:22:48 2002 -+++ php-4.3.0/sapi/cli/Makefile.frag Thu Jan 2 23:35:16 2003 -@@ -1,4 +1,4 @@ --$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS) -+$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS) - $(BUILD_CLI) - - install-cli: $(SAPI_CLI_PATH) ---- php-4.3.0/sapi/cgi/config9.m4.orig Thu Dec 19 17:55:57 2002 -+++ php-4.3.0/sapi/cgi/config9.m4 Fri Jan 3 11:19:24 2003 -@@ -155,7 +155,7 @@ - BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - esac - ---- php-4.3.0/sapi/cli/config.m4.orig Fri Dec 20 11:04:55 2002 -+++ php-4.3.0/sapi/cli/config.m4 Fri Jan 3 11:20:42 2003 -@@ -24,10 +24,10 @@ - ;; - *cygwin*) - SAPI_CLI_PATH=sapi/cli/php.exe -- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" - ;; - *) -- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" -+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" - ;; - esac - INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php" diff --git a/php-threads-acfix.patch b/php-threads-acfix.patch deleted file mode 100644 index 2844dd0..0000000 --- a/php-threads-acfix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- php-4.3.1/TSRM/threads.m4.orig Wed Feb 19 15:57:09 2003 -+++ php-4.3.1/TSRM/threads.m4 Wed Feb 19 15:57:42 2003 -@@ -108,7 +108,6 @@ - else - save_CFLAGS=$CFLAGS - save_LIBS=$LIBS -- PTHREADS_ASSIGN_VARS - PTHREADS_CHECK_COMPILE - LIBS=$save_LIBS - CFLAGS=$save_CFLAGS -@@ -126,9 +125,10 @@ - break - fi - done -+ pthreads_working= - fi --fi - ]) -+fi - - AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[ - ac_cv_pthreads_lib= -@@ -155,6 +155,7 @@ - dnl - dnl - AC_DEFUN(PTHREADS_ASSIGN_VARS,[ -+if test "$pthreads_assign_done" != "yes" ; then - if test -n "$ac_cv_pthreads_lib"; then - LIBS="$LIBS -l$ac_cv_pthreads_lib" - fi -@@ -163,4 +164,6 @@ - if test -n "$ac_cv_pthreads_cflags"; then - CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" - fi -+pthreads_assign_done="yes" -+fi - ])dnl diff --git a/php-tsrmlsfetchgcc2.patch b/php-tsrmlsfetchgcc2.patch deleted file mode 100644 index 7c26fb3..0000000 --- a/php-tsrmlsfetchgcc2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-4.3.1/ext/standard/mail.c~ Mon Feb 24 10:53:36 2003 -+++ php-4.3.1/ext/standard/mail.c Mon Feb 24 10:58:35 2003 -@@ -201,7 +201,7 @@ - return 0; - } - #endif -- TSRMLS_FETCH(); -+ {TSRMLS_FETCH();} - - if ((to != NULL) && (strlen(to)!=0)) { - fprintf(sendmail, "To: %s\n", to); diff --git a/php-wddx-fix.patch b/php-wddx-fix.patch deleted file mode 100644 index 6757b0c..0000000 --- a/php-wddx-fix.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- php-4.3.0/ext/wddx/config.m4.orig Tue Mar 12 17:37:42 2002 -+++ php-4.3.0/ext/wddx/config.m4 Thu Jan 2 21:00:50 2003 -@@ -12,4 +12,6 @@ - fi - AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) -+ WDDX_SHARED_LIBADD="-lexpat" -+ PHP_SUBST(WDDX_SHARED_LIBADD) - fi diff --git a/php-xml-expat-fix.patch b/php-xml-expat-fix.patch deleted file mode 100644 index 41c4088..0000000 --- a/php-xml-expat-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-4.3.0/ext/xml/config.m4.orig Thu Nov 7 20:31:08 2002 -+++ php-4.3.0/ext/xml/config.m4 Thu Jan 2 19:54:39 2003 -@@ -27,7 +27,7 @@ - else - PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) - -- for i in $PHP_XML $PHP_EXPAT_DIR; do -+ for i in /usr /usr/local $PHP_XML `echo $PHP_EXPAT_DIR | sed -e s/shared,//` ; do - if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then - EXPAT_DIR=$i - fi diff --git a/php-xml_fix b/php-xml_fix deleted file mode 100644 index 6396be1..0000000 --- a/php-xml_fix +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_builddir)/config_vars.mk -LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) -LTLIBRARY_SHARED_OBJECTS = $(LTLIBRARY_OBJECTS:.lo=.slo) -$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) - $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) -$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_SHARED_OBJECTS) $(LTLIBRARY_DEPENDENCIES) - $(SHARED_LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD) - $(SHARED_LIBTOOL) --mode=install cp $@ $(phplibdir) - -targets = $(LTLIBRARY_NAME) $(LTLIBRARY_SHARED_NAME) - diff --git a/php-xmlrpc-fix.patch b/php-xmlrpc-fix.patch deleted file mode 100644 index 52e699b..0000000 --- a/php-xmlrpc-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-4.3.0/ext/xmlrpc/config.m4.orig Wed Sep 4 20:47:25 2002 -+++ php-4.3.0/ext/xmlrpc/config.m4 Thu Jan 2 21:29:53 2003 -@@ -85,6 +85,8 @@ - AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution) - fi - -+ PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared) -+ XMLRPC_MODULE_TYPE=external - PHP_ADD_INCLUDE($XMLRPC_DIR) - PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) - diff --git a/php-xslt-gcc33.patch b/php-xslt-gcc33.patch deleted file mode 100644 index c09e2db..0000000 --- a/php-xslt-gcc33.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- php-4.3.2/ext/xslt/config.m4.orig Wed Apr 23 08:55:00 2003 -+++ php-4.3.2/ext/xslt/config.m4 Fri Jun 13 13:08:17 2003 -@@ -66,7 +66,7 @@ - SABINF_CFLAGS=`$XSLT_DIR/bin/sablot-config --cflags` - SABINF_LIBS=`$XSLT_DIR/bin/sablot-config --libs` - SABINF_PREFIX=`$XSLT_DIR/bin/sablot-config --prefix` -- SABINF_ALL="\"Cflags: $SABINF_CFLAGS\nLibs: $SABINF_LIBS\nPrefix: $SABINF_PREFIX\"" -+ SABINF_ALL="\"Cflags: $SABINF_CFLAGS\\\\nLibs: $SABINF_LIBS\\\\nPrefix: $SABINF_PREFIX\"" - PHP_DEFINE(SAB_INFO, "$SABINF_ALL") - else - AC_MSG_RESULT(not found) diff --git a/php.spec b/php.spec deleted file mode 100644 index 4a291c7..0000000 --- a/php.spec +++ /dev/null @@ -1,2370 +0,0 @@ -# -# TODO: -# - fastcgi option in cgi SAPI? or separate fcgi SAPI? -# - make sure that session-unregister patch is no longer needed -# (any crash reports related to session modules?) -# -# Automatic pear requirements finding: -%include /usr/lib/rpm/macros.php - -%define _apache2 %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 1 || echo 0) -%define apxs /usr/sbin/apxs - -%if %{_apache2} -%define _without_recode 1 -%define _without_mm 1 -%endif - -%ifnarch %{ix86} -%define _without_interbase 1 -%define _without_msession 1 -%endif - -# Conditional build: -# _with_db3 - use db3 packages instead of db (4.x) for Berkeley DB support -# _with_interbase_inst - use InterBase install., not Firebird (BR: proprietary libs) -# _with_java - with Java extension module (BR: jdk) -# _with_oci8 - with Oracle oci8 extension module (BR: proprietary libs) -# _with_oracle - with oracle extension module (BR: proprietary libs) -# _with_pcntl - with pcntl extension module (problems: SEGV on exit) -# _without_cpdf - without cpdf extension module -# _without_curl - without CURL extension module -# _without_domxslt - without DOM XSLT/EXSLT support in DOM XML extension module -# _without_gif - build GD extension module with gd library without GIF support -# _without_imap - without IMAP extension module -# _without_interbase - without InterBase extension module -# _without_ldap - without LDAP extension module -# _without_mhash - without mhash extension module -# _without_ming - without ming extension module -# _without_mm - without mm support for session storage -# _without_mnogosearch - without mnogosearch extension module -# _without_msession - without msession extension module -# _without_odbc - without ODBC extension module -# _without_openssl - without OpenSSL support and OpenSSL extension (module) -# _without_pcre - without PCRE extension module -# _without_pdf - without PDF extension module -# _without_pgsql - without PostgreSQL extension module -# _without_pspell - without pspell extension module -# _without_recode - without recode extension module -# _without_snmp - without SNMP extension module -# _without_sybase_ct - without Sybase-CT extension module -# _without_wddx - without WDDX extension module -# _without_xmlrpc - without XML-RPC extension module -# _without_xml - without XML and DOMXML extension modules -# _without_xslt - without XSLT extension module -# _without_yaz - without YAZ extension module - -Summary: The PHP HTML-embedded scripting language for use with Apache -Summary(fr): Le langage de script embarque-HTML PHP pour Apache -Summary(pl): Jêzyk skryptowy PHP -- u¿ywany wraz z serwerem Apache -Summary(pt_BR): A linguagem de script PHP -Summary(ru): PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ -Summary(uk): PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦ -Name: php -Version: 4.3.2 -Release: 0.4 -Epoch: 3 -Group: Libraries -License: PHP -# Source0-md5: 8aec1bb2dbcca1c92835c71e2e30d9c5 -Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 -Source1: FAQ.%{name} -Source2: zend.gif -Source4: %{name}-module-install -Source5: %{name}-mod_%{name}.conf -Source6: %{name}-cgi.ini -Source7: %{name}-apache.ini -Source8: %{name}-cli.ini -Patch0: %{name}-shared.patch -Patch1: %{name}-pldlogo.patch -Patch2: %{name}-xml-expat-fix.patch -Patch3: %{name}-mail.patch -Patch4: %{name}-link-libs.patch -Patch5: %{name}-libpq_fs_h_path.patch -Patch6: %{name}-wddx-fix.patch -Patch7: %{name}-cpdf-fix.patch -Patch8: %{name}-hyperwave-fix.patch -Patch9: %{name}-xslt-gcc33.patch -Patch10: %{name}-java-norpath.patch -Patch11: %{name}-mcal-shared-lib.patch -Patch12: %{name}-msession-shared-lib.patch -Patch13: %{name}-build_modules.patch -Patch14: %{name}-sapi-ini-file.patch -Patch15: %{name}-dl-zlib.patch -Patch16: %{name}-no-metaccld.patch -Patch17: %{name}-session-unregister.patch -Patch18: %{name}-ini.patch -Patch19: %{name}-acam.patch -Patch20: %{name}-xmlrpc-fix.patch -Patch21: %{name}-libtool.patch -Patch22: %{name}-allow-db31.patch -Patch23: %{name}-threads-acfix.patch -Patch24: %{name}-tsrmlsfetchgcc2.patch -Patch25: %{name}-mnogosearch-php-extension-1.68.patch -Patch26: %{name}-pear-install.patch -Patch27: %{name}-zlib.patch -Icon: php4.gif -URL: http://www.php.net/ -%{!?_without_interbase:%{!?_with_interbase_inst:BuildRequires: Firebird-devel}} -BuildRequires: apache-devel -BuildRequires: autoconf >= 2.53 -BuildRequires: automake >= 1.4d -BuildRequires: bison -BuildRequires: bzip2-devel -BuildRequires: cracklib-devel >= 2.7-15 -%{!?_without_curl:BuildRequires: curl-devel >= 7.9.8 } -BuildRequires: cyrus-sasl-devel -%{?_with_db3:BuildRequires: db3-devel >= 3.1} -%{!?_with_db3:BuildRequires: db-devel >= 4.0} -%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1}) -BuildRequires: expat-devel -%endif -BuildRequires: flex -%{!?_without_sybase_ct:BuildRequires: freetds-devel} -BuildRequires: freetype-devel >= 2.0 -BuildRequires: gd-devel >= 2.0.1 -%{!?_without_gif:BuildRequires: gd-devel(gif)} -%{?_without_gif:BuildConflicts: gd-devel(gif)} -BuildRequires: gdbm-devel -BuildRequires: gmp-devel -%{!?_without_imap:BuildRequires: imap-devel >= 1:2001-0.BETA.200107022325.2 } -%{?_with_java:BuildRequires: jdk >= 1.1} -%{!?_without_cpdf:BuildRequires: libcpdf-devel >= 2.02r1-2} -BuildRequires: libjpeg-devel -BuildRequires: libltdl-devel >= 1.4 -BuildRequires: libmcal-devel -BuildRequires: libmcrypt-devel >= 2.4.4 -BuildRequires: libpng >= 1.0.8 -BuildRequires: libtiff-devel -BuildRequires: libtool >= 1.4.3 -%{!?_without_xml:BuildRequires: libxml2-devel >= 2.2.7} -%{!?_without_domxslt:BuildRequires: libxslt-devel >= 1.0.3} -%{!?_without_mhash:BuildRequires: mhash-devel} -%{!?_without_ming:BuildRequires: ming-devel >= 0.1.0} -%{!?_without_mm:BuildRequires: mm-devel >= 1.3.0} -%{!?_without_mnogosearch:BuildRequires: mnogosearch-devel >= 3.2.6} -BuildRequires: mysql-devel >= 3.23.32 -%{!?_without_ldap:BuildRequires: openldap-devel >= 2.0} -%if %(expr %{?_without_openssl:0}%{!?_without_openssl:1} + %{?_without_ldap:0}%{!?_without_ldap:1}) -BuildRequires: openssl-devel >= 0.9.7 -%endif -BuildRequires: pam-devel -%{!?_without_pdf:BuildRequires: pdflib-devel >= 4.0.0} -BuildRequires: %{__perl} -%{!?_without_msession:BuildRequires: phoenix-devel} -%{!?_without_pgsql:BuildRequires: postgresql-devel} -%{!?_without_pgsql:BuildRequires: postgresql-backend-devel >= 7.2} -%{!?_without_pspell:BuildRequires: pspell-devel} -%{!?_without_recode:BuildRequires: recode-devel >= 3.5d-3} -BuildRequires: rpm-php-pearprov >= 4.0.2-100 -%{!?_without_xslt:BuildRequires: sablotron-devel >= 0.96} -BuildRequires: t1lib-devel -%{!?_without_snmp:BuildRequires: net-snmp-devel >= 5.0.7} -%{!?_without_odbc:BuildRequires: unixODBC-devel} -%{!?_without_xmlrpc:BuildRequires: xmlrpc-epi-devel} -%{!?_without_yaz:BuildRequires: yaz-devel >= 1.9} -BuildRequires: zip -BuildRequires: zlib-devel >= 1.0.9 -BuildRequires: zziplib-devel -#BuildRequires: fcgi-devel -# apache 1.3 vs apache 2.0 -%if %{_apache2} -PreReq: apache >= 2.0.40 -%requires_eq apache -%else -PreReq: apache(EAPI) < 2.0.0 -PreReq: apache(EAPI) >= 1.3.9 -Requires(post,preun): %{apxs} -Requires(post,preun): %{__perl} -%endif -PreReq: %{name}-common = %{epoch}:%{version} -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -Obsoletes: phpfi -Obsoletes: apache-mod_php - -%define _sysconfdir /etc/php -%define extensionsdir %{_libdir}/php -%define httpdir /home/services/httpd - -%description -PHP is an HTML-embedded scripting language. PHP attempts to make it -easy for developers to write dynamically generated web pages. PHP also -offers built-in database integration for several commercial and -non-commercial database management systems, so writing a -database-enabled web page with PHP is fairly simple. The most common -use of PHP coding is probably as a replacement for CGI scripts. The -mod_php module enables the Apache web server to understand and process -the embedded PHP language in web pages. This package contains PHP -version %{version}. If you use applications which specifically rely on -PHP/FI (PHP v2 and earlier), you should instead install the PHP/FI -module contained in the phpfi package. If you're just starting with -PHP, you should install this package. You'll also need to install the -Apache web server. - -%description -l fr -PHP est un langage de script embarque dans le HTM. PHP essaye de -rendre simple aux developpeurs d'ecrire des pages web generees -dynamiquement. PHP incorpore egalement une integration avec plusieurs -systemes de gestion de bases de donnees commerciaux et -non-connerciaux, qui rent facile la creation de pages web liees avec -des bases de donnees. L'utilisation la plus commune de PHP est -probablement en remplacement de scripts CGI. Le module mod_php permet -au serveur web apache de comprendre et de traiter le langage PHP -integre dans des pages web. Ce package contient PHP version -%{version}. Si vous utilisez des applications qui utilisent -specifiquement PHP/FI, vous devrez installer le module PHP/FI inclus -dans le package mod_php. Si vous debutez avec PHP, vous devriez -installer ce package. Vous aurez egalement besoin dinstaller le -serveur web Apache. - -%description -l pl -PHP jest jêzykiem skryptowym, którego polecenia umieszcza siê w -plikach HTML. Pakiet ten zawiera modu³ przeznaczony dla serwera HTTP -(jak np. Apache), który interpretuje te polecenia. Umo¿liwia to -tworzenie dynamicznie stron WWW. Spora czê¶æ sk³adni PHP zapo¿yczona -zosta³a z jêzyków: C, Java i Perl. - -%description -l pt_BR -PHP: Preprocessador de Hipertexto versão 4 é uma linguagem script -embutida em HTML. Muito de sua sintaxe é emprestada de C, Java e Perl, -com algumas características únicas, específicas ao PHP. O objetivo da -linguagem é permitir que desenvolvedores web escrevam páginas -dinamicamente geradas de forma rápida. - -%description -l ru -PHP4 - ÜÔÏ ÑÚÙË ÎÁÐÉÓÁÎÉÑ ÓËÒÉÐÔÏ×, ×ÓÔÒÁÉ×ÁÅÍÙÈ × HTML-ËÏÄ. PHP -ÐÒÅÄÌÁÇÁÅÔ ÉÎÔÅÒÇÒÁÃÉÀ Ó ÍÎÏÖÅÓÔ×ÏÍ óõâä, ÐÏÜÔÏÍÕ ÎÁÐÉÓÁÎÉÅ ÓËÒÉÐÔÏ× -ÄÌÑ ÒÁÂÏÔÙ Ó ÂÁÚÁÍÉ ÄÁÎÎÙÈ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÒÏÓÔÏ. îÁÉÂÏÌÅÅ ÐÏÐÕÌÑÒÎÏÅ -ÉÓÐÏÌØÚÏ×ÁÎÉÅ PHP - ÚÁÍÅÎÁ ÄÌÑ CGI ÓËÒÉÐÔÏ×. - -üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÁÍÏÄÏÓÔÁÔÏÞÎÕÀ (CGI) ×ÅÒÓÉÀ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ ÑÚÙËÁ. -÷Ù ÄÏÌÖÎÙ ÔÁËÖÅ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ %{name}-common. åÓÌÉ ×ÁÍ ÎÕÖÅÎ -ÉÎÔÅÒÐÒÅÔÁÔÏÒ PHP × ËÁÞÅÓÔ×Å ÍÏÄÕÌÑ apache, ÕÓÔÁÎÏ×ÉÔÅ ÐÁËÅÔ -apache-php. - -%description -l uk -PHP4 - ÃÅ ÍÏ×Á ÎÁÐÉÓÁÎÎÑ ÓËÒÉÐÔ¦×, ÝÏ ×ÂÕÄÏ×ÕÀÔØÓÑ × HTML-ËÏÄ. PHP -ÐÒÏÐÏÎÕ¤ ¦ÎÔÅÇÒÁæÀ Ú ÂÁÇÁÔØÍÁ óõâä, ÔÏÍÕ ÎÁÐÉÓÁÎÎÑ ÓËÒÉÐÔ¦× ÄÌÑ -ÒÏÂÏÔÉ Ú ÂÁÚÁÍÉ ÄÁÎÉÈ ¤ ÄÏ×Ï̦ ÐÒÏÓÔÉÍ. îÁʦÌØÛ ÐÏÐÕÌÑÒÎÅ -×ÉËÏÒÉÓÔÁÎÎÑ PHP - ÚÁͦÎÁ ÄÌÑ CGI ÓËÒÉÐÔ¦×. - -ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÁÍÏÄÏÓÔÁÔÎÀ (CGI) ×ÅÒÓ¦À ¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ ÍÏ×É. ÷É -ÍÁ¤ÔÅ ÔÁËÏÖ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔ %{name}-common. ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÅÎ -¦ÎÔÅÒÐÒÅÔÁÔÏÒ PHP × ÑËÏÓÔ¦ ÍÏÄÕÌÑ apache, ×ÓÔÁÎÏצÔØ ÐÁËÅÔ apache-php. - -%package cgi -Summary: PHP as CGI program -Summary(pl): PHP jako program CGI -Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version} -Provides: php-program = %{epoch}:%{version}-%{release} - -%description cgi -PHP as CGI program. - -%description cgi -l pl -PHP jako program CGI. - -%package cli -Summary: PHP as CLI interpreter -Summary(pl): PHP jako interpreter dzia³aj±cy z linii poleceñ -Group: Development/Languages/PHP -PreReq: %{name}-common = %{epoch}:%{version} -Provides: php-program = %{epoch}:%{version}-%{release} - -%description cli -PHP as CLI interpreter. - -%description cli -l pl -PHP jako interpreter dzia³aj±cy z linii poleceñ. - -%package common -Summary: Common files needed by both apache module and CGI -Summary(pl): Wspólne pliki dla modu³u apache'a i programu CGI -Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ php -Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ php -Group: Libraries -Provides: %{name}-session = %{epoch}:%{version}-%{release} -Provides: %{name}-openssl = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-session <= %{epoch}:%{version}-%{release} -Obsoletes: %{name}-openssl <= %{epoch}:%{version}-%{release} - -%description common -Common files needed by both apache module and CGI. - -%description common -l pl -Wspólne pliki dla modu³u apacha i programu CGI. - -%description common -l ru -üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÏÂÝÉÅ ÆÁÊÌÙ ÄÌÑ ÒÁÚÎÙÈ ×ÁÒÉÁÎÔÏ× ÒÅÁÌÉÚÁÃÉÉ PHP -(ÓÁÍÏÄÏÓÔÁÔÏÞÎÏÊ É × ËÁÞÅÓÔ×Å ÍÏÄÕÌÑ apache). - -%description common -l uk -ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓЦÌØΦ ÆÁÊÌÉ ÄÌÑ Ò¦ÚÎÉÈ ×ÁÒ¦ÁÎÔ¦× ÒÅÁ̦ÚÁæ§ PHP -(ÓÁÍÏÄÏÓÔÁÔÎØϧ ÔÁ × ÑËÏÓÔ¦ ÍÏÄÕÌÑ apache). - -%package devel -Summary: Files for PHP modules development -Summary(pl): Pliki do kompilacji modu³ów PHP -Summary(pt_BR): Arquivos de desenvolvimento para PHP -Summary(ru): ðÁËÅÔ ÒÁÚÒÁÂÏÔËÉ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÒÁÓÛÉÒÅÎÉÊ PHP4 -Summary(uk): ðÁËÅÔ ÒÏÚÒÏÂËÉ ÄÌÑ ÐÏÂÕÄÏ×É ÒÏÚÛÉÒÅÎØ PHP4 -Group: Development/Languages/PHP -Requires: %{name}-common = %{epoch}:%{version} -Obsoletes: %{name}-pear-devel - -%description devel -The php-devel package lets you compile dynamic extensions to PHP. -Included here is the source for the php extensions. Instead of -recompiling the whole php binary to add support for, say, oracle, -install this package and use the new self-contained extensions -support. For more information, read the file -SELF-CONTAINED-EXTENSIONS. - -%description devel -l pl -Pliki potrzebne do kompilacji modu³ów PHP. - -%description devel -l pt_BR -Este pacote contém arquivos usados no desenvolvimento de programas ou -módulos PHP. - -%description devel -l uk -ðÁËÅÔ php-devel ÄÁ¤ ÍÏÖÌÉצÓÔØ ËÏÍЦÌÀ×ÁÔÉ ÄÉÎÁͦÞΦ ÒÏÚÛÉÒÅÎÎÑ PHP. -äÏ ÐÁËÅÔÕ ×ËÌÀÞÅÎÏ ×ÉȦÄÎÉÊ ËÏÄ ÄÌÑ ÒÏÚÛÉÒÅÎØ. úÁͦÓÔØ ÐÏ×ÔÏÒÎϧ -ËÏÍЦÌÑæ§ ¦ÎÁÒÎÏÇÏ ÆÁÊÌÕ php ÄÌÑ ÄÏÄÁÎÎÑ, ÎÁÐÒÉËÌÁÄ, ЦÄÔÒÉÍËÉ -oracle, ×ÓÔÁÎÏצÔØ ÃÅÊ ÐÁËÅÔ ÄÌÑ ËÏÍЦÌÑæ§ ÏËÒÅÍÉÈ ÒÏÚÛÉÒÅÎØ. -äÅÔÁÌØΦÛÁ ¦ÎÆÏÒÍÁÃ¦Ñ - × ÆÁÊ̦ SELF-CONTAINED-EXTENSIONS. - -%description devel -l ru -ðÁËÅÔ php-devel ÄÁÅÔ ×ÏÚÍÏÖÎÏÓÔØ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÄÉÎÁÍÉÞÅÓËÉÅ ÒÁÓÛÉÒÅÎÉÑ -PHP. ðÁËÅÔ ×ËÌÀÞÁÅÔ ÉÓÈÏÄÎÙÊ ËÏÄ ÜÔÉÈ ÒÁÓÛÉÒÅÎÉÊ. ÷ÍÅÓÔÏ ÐÏ×ÔÏÒÎÏÊ -ËÏÍÐÉÌÑÃÉÉ ÂÉÎÁÒÎÏÇÏ ÆÁÊÌÁ php ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ, ÎÁÐÒÉÍÅÒ, ÐÏÄÄÅÒÖËÉ -oracle, ÕÓÔÁÎÏ×ÉÔÅ ÜÔÏÔ ÐÁËÅÔ ÄÌÑ ËÏÍÐÉÌÉÒÏ×ÁÎÉÑ ÏÔÄÅÌØÎÙÈ ÒÁÓÛÉÒÅÎÉÊ. -ðÏÄÒÏÂÎÏÓÔÉ - × ÆÁÊÌÅ SELF-CONTAINED-EXTENSIONS. - -%package bcmath -Summary: bcmath extension module for PHP -Summary(pl): Modu³ bcmath dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description bcmath -This is a dynamic shared object (DSO) for Apache that will add bc -style precision math functions support to PHP. - -%description bcmath -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z dok³adnych funkcji -matematycznych takich jak w programie bc. - -%package bzip2 -Summary: Bzip2 extension module for PHP -Summary(pl): Modu³ bzip2 dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description bzip2 -This is a dynamic shared object (DSO) for Apache that will add -compression (bzip2) support to PHP. - -%description bzip2 -l pl -Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji (poprzez bibliotekê bzip2). - -%package calendar -Summary: Calendar extension module for PHP -Summary(pl): Modu³ funkcji kalendarza dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description calendar -This is a dynamic shared object (DSO) for Apache that will add -calendar support to PHP. - -%description calendar -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -wsparcie dla kalendarza. - -%package cpdf -Summary: cpdf extension module for PHP -Summary(pl): Modu³ cpdf dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description cpdf -This is a dynamic shared object (DSO) for Apache that will add libcpdf -support to PHP. - -%description cpdf -l pl -Modu³ PHP dodaj±cy obs³ugê biblioteki libcpdf. - -%package crack -Summary: crack extension module for PHP -Summary(pl): Modu³ crack dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description crack -This is a dynamic shared object (DSO) for Apache that will add -cracklib support to PHP. - -Warning: this is an experimental module. - -%description crack -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki cracklib. - -Uwaga: to jest modu³ eksperymentalny. - -%package ctype -Summary: ctype extension module for PHP -Summary(pl): Modu³ ctype dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description ctype -This is a dynamic shared object (DSO) for Apache that will add ctype -support to PHP. - -%description ctype -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z funkcji ctype. - -%package curl -Summary: curl extension module for PHP -Summary(pl): Modu³ curl dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description curl -This is a dynamic shared object (DSO) for Apache that will add curl -support to PHP. - -%description curl -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki curl. - -%package dba -Summary: DBA extension module for PHP -Summary(pl): Modu³ DBA dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description dba -This is a dynamic shared object (DSO) for Apache that will add -flat-file databases (DBA) support to PHP. - -%description dba -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -wsparcie dla baz danych opartych na plikach (DBA). - -%package dbase -Summary: DBase extension module for PHP -Summary(pl): Modu³ DBase dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description dbase -This is a dynamic shared object (DSO) for Apache that will add DBase -support to PHP. - -%description dbase -l pl -Modu³ PHP ze wsparciem dla DBase. - -%package dbx -Summary: DBX extension module for PHP -Summary(pl): Modu³ DBX dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description dbx -This is a dynamic shared object (DSO) for Apache that will add DB -abstraction layer to PHP. DBX supports odbc, mysql, pgsql, mssql, -fbsql and more. - -%description dbx -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -warstwê abstrakcji do obs³ugi baz danych. DBX obs³uguje bazy odbc, -mysql, pgsql, mssql, fbsql i inne. - -%package dio -Summary: Direct I/O extension module for PHP -Summary(pl): Modu³ Direct I/O dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description dio -This is a dynamic shared object (DSO) for Apache that will add direct -file I/O support to PHP. - -%description dio -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -obs³ugê bezpo¶rednich operacji I/O na plikach. - -%package domxml -Summary: DOM XML extension module for PHP -Summary(pl): Modu³ DOM XML dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description domxml -This is a dynamic shared object (DSO) for Apache that will add DOM XML -support to PHP. - -Warning: this is an experimental module. - -%description domxml -l pl -Modu³ PHP dodaj±cy obs³ugê DOM XML. - -Uwaga: to jest modu³ eksperymentalny. - -%package exif -Summary: exif extension module for PHP -Summary(pl): Modu³ exif dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description exif -This is a dynamic shared object (DSO) for Apache that will add exif -support to PHP. - -%description exif -l pl -Modu³ PHP dodaj±cy obs³ugê plików EXIF. - -%package filepro -Summary: filePro extension module for PHP -Summary(pl): Modu³ filePro dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description filepro -This is a dynamic shared object (DSO) for Apache that will add PHP -support for read-only access to filePro databases. - -%description filepro -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -mo¿liwo¶æ dostêpu (tylko do odczytu) do baz danych filePro. - -%package ftp -Summary: FTP extension module for PHP -Summary(pl): Modu³ FTP dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description ftp -This is a dynamic shared object (DSO) for Apache that will add FTP -support to PHP. - -%description ftp -l pl -Modu³ PHP dodaj±cy obs³ugê protoko³u FTP. - -%package gd -Summary: GD extension module for PHP -Summary(pl): Modu³ GD dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -%{!?_without_gif:Requires: gd(gif)} -%{!?_without_gif:Provides: %{name}-gd(gif) = %{epoch}:%{version}-%{release}} - -%description gd -This is a dynamic shared object (DSO) for Apache that will add GD -support to PHP. You should install this package in addition to the -main %{name} package if you want to create and manipulate images with -PHP. - -%description gd -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki GD - do obróbki -obrazków z poziomu PHP. - -%package gettext -Summary: gettext extension module for PHP -Summary(pl): Modu³ gettext dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description gettext -This is a dynamic shared object (DSO) for Apache that will add gettext -support to PHP. - -%description gettext -l pl -Modu³ PHP dodaj±cy obs³ugê lokalizacji przez gettext. - -%package gmp -Summary: gmp extension module for PHP -Summary(pl): Modu³ gmp dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description gmp -This is a dynamic shared object (DSO) for Apache that will add -arbitrary length number support with GNU MP library to PHP. - -%description gmp -l pl -Modu³ PHP umorzliwiaj±cy korzystanie z biblioteki gmp. - -%package hyperwave -Summary: Hyperwave extension module for PHP -Summary(pl): Modu³ Hyperwave dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description hyperwave -This is a dynamic shared object (DSO) for Apache that will add -Hyperwave support to PHP. - -%description hyperwave -l pl -Modu³ PHP dodaj±cy obs³ugê Hyperwave. - -%package iconv -Summary: iconv extension module for PHP -Summary(pl): Modu³ iconv dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description iconv -This is a dynamic shared object (DSO) for Apache that will add iconv -support to PHP. - -%description iconv -l pl -Modu³ PHP dodaj±cy obs³ugê iconv. - -%package imap -Summary: IMAP extension module for PHP -Summary(pl): Modu³ IMAP dla PHP -Summary(pt_BR): Um módulo para aplicações PHP que usam IMAP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description imap -This is a dynamic shared object (DSO) for Apache that will add IMAP -support to PHP. - -%description imap -l pl -Modu³ PHP dodaj±cy obs³ugê skrzynek IMAP. - -%description imap -l pt_BR -Um módulo para aplicações PHP que usam IMAP. - -%package interbase -Summary: InterBase/Firebird database module for PHP -Summary(pl): Modu³ bazy danych InterBase/Firebird dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -%{?_with_interbase_inst:Autoreq: false} - -%description interbase -This is a dynamic shared object (DSO) for Apache that will add -InterBase and Firebird database support to PHP. - -%description interbase -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do baz danych InterBase i Firebird. - -%package java -Summary: Java extension module for PHP -Summary(pl): Modu³ Javy dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description java -This is a dynamic shared object (DSO) for Apache that will add JAVA -support to PHP. This extension provides a simple and effective means -for creating and invoking methods on Java objects from PHP. - -Note: it requires setting LD_LIBRARY_PATH to JRE directories -containing JVM libraries (e.g. libjava.so, libverify.so and libjvm.so -for Sun's JRE) before starting Apache or PHP interpreter. - -%description java -l pl -Modu³ PHP dodaj±cy wsparcie dla Javy. Umo¿liwia odwo³ywanie siê do -obiektów Javy z poziomu PHP. - -Uwaga: modu³ wymaga ustawienia LD_LIBRARY_PATH na katalogi JRE -zawieraj±ce biblioteki JVM (np. libjava.so, libverify.so i libjvm.so -dla JRE Suna) przed uruchomieniem Apache'a lub interpretera PHP. - -%package ldap -Summary: LDAP extension module for PHP -Summary(pl): Modu³ LDAP dla PHP -Summary(pt_BR): Um módulo para aplicações PHP que usam LDAP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description ldap -This is a dynamic shared object (DSO) for Apache that will add LDAP -support to PHP. - -%description ldap -l pl -Modu³ PHP dodaj±cy obs³ugê LDAP. - -%description ldap -l pt_BR -Um módulo para aplicações PHP que usam LDAP. - -%package mbstring -Summary: mbstring extension module for PHP -Summary(pl): Modu³ mbstring dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mbstring -This is a dynamic shared object (DSO) for Apache that will add -multibyte string support to PHP. - -%description mbstring -l pl -Modu³ PHP dodaj±cy obs³ugê ci±gów znaków wielobajtowych. - -%package mcal -Summary: mcal extension module for PHP -Summary(pl): Modu³ mcal dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mcal -This is a dynamic shared object (DSO) for Apache that will add mcal -(Modular Calendar Access Library) support to PHP. - -%description mcal -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki mcal (daj±cej dostêp -do kalendarzy). - -%package mcrypt -Summary: mcrypt extension module for PHP -Summary(pl): Modu³ mcrypt dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mcrypt -This is a dynamic shared object (DSO) for Apache that will add mcrypt -support to PHP. - -%description mcrypt -l pl -Modu³ PHP dodaj±cy mo¿liwo¶æ szyfrowania poprzez bibliotekê mcrypt. - -%package mhash -Summary: mhash extension module for PHP -Summary(pl): Modu³ mhash dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mhash -This is a dynamic shared object (DSO) for Apache that will add mhash -support to PHP. - -%description mhash -l pl -Modu³ PHP udostêpniaj±cy funkcje mieszaj±ce z biblioteki mhash. - -%package ming -Summary: ming extension module for PHP -Summary(pl): Modu³ ming dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description ming -This is a dynamic shared object (DSO) for Apache that will add ming -(Flash - .swf files) support to PHP. - -%description ming -l pl -Modu³ PHP dodaj±cy obs³ugê plików Flash (.swf) poprzez bibliotekê -ming. - -%package mnogosearch -Summary: mnoGoSearch extension module for PHP -Summary(pl): Modu³ mnoGoSearch dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mnogosearch -This is a dynamic shared object (DSO) for Apache that will allow you -to access mnoGoSearch free search engine in PHP. - -%description mnogosearch -l pl -Modu³ PHP dodaj±cy pozwalaj±cy na dostêp do wolnodostêpnego silnika -wyszukiwarki mnoGoSearch. - -%package msession -Summary: msession extension module for PHP -Summary(pl): Modu³ msession dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description msession -This is a dynamic shared object (DSO) for Apache that will allow you -to use msession in PHP. msession is a high speed session daemon which -can run either locally or remotely. It is designed to provide -consistent session management for a PHP web farm. - -%description msession -l pl -Modu³ PHP dodaj±cy umo¿liwiaj±cy korzystanie z demona msession. Jest -to demon szybkiej obs³ugi sesji, który mo¿e dzia³aæ lokalnie lub na -innej maszynie. S³u¿y do zapewniania spójnej obs³ugi sesji dla farmy -serwerów. - -%package mysql -Summary: MySQL database module for PHP -Summary(pl): Modu³ bazy danych MySQL dla PHP -Summary(pt_BR): Um módulo para aplicações PHP que usam bancos de dados MySQL -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description mysql -This is a dynamic shared object (DSO) for Apache that will add MySQL -database support to PHP. If you need back-end support for MySQL, you -should install this package in addition to the main %{name} package. - -%description mysql -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych MySQL. - -%description mysql -l pt_BR -Um módulo para aplicações PHP que usam bancos de dados MySQL. - -%package oci8 -Summary: Oracle 8 database module for PHP -Summary(pl): Modu³ bazy danych Oracle 8 dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -Autoreq: false - -%description oci8 -This is a dynamic shared object (DSO) for Apache that will add Oracle -7 and Oracle 8 database support to PHP through Oracle8 Call-Interface -(OCI8). - -%description oci8 -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych Oracle 7 i Oracle 8 -poprzez interfejs Oracle8 Call-Interface (OCI8). - -%package odbc -Summary: ODBC extension module for PHP -Summary(pl): Modu³ ODBC dla PHP -Summary(pt_BR): Um módulo para aplicações PHP que usam bases de dados ODBC -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -Requires: unixODBC >= 2.1.1-3 - -%description odbc -This is a dynamic shared object (DSO) for Apache that will add ODBC -support to PHP. - -%description odbc -l pl -Modu³ PHP ze wsparciem dla ODBC. - -%description odbc -l pt_BR -Um módulo para aplicações PHP que usam ODBC. - -%package openssl -Summary: OpenSSL extension module for PHP -Summary(pl): Modu³ OpenSSL dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description openssl -This is a dynamic shared object (DSO) for Apache that will add OpenSSL -support to PHP. - -Warning: this is an experimental module. - -%description openssl -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z biblioteki OpenSSL. - -Uwaga: to jest modu³ eksperymentalny. - -%package oracle -Summary: Oracle 7 database module for PHP -Summary(pl): Modu³ bazy danych Oracle 7 dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -Autoreq: false - -%description oracle -This is a dynamic shared object (DSO) for Apache that will add Oracle -7 database support to PHP. - -%description oracle -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych Oracle 7. - -%package overload -Summary: Overload extension module for PHP -Summary(pl): Modu³ Overload dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description overload -This is a dynamic shared object (DSO) for Apache that will add -user-space object overloading support to PHP. - -Warning: this is an experimental module. - -%description overload -l pl -Modu³ PHP umo¿liwiaj±cy przeci±¿anie obiektów. - -Uwaga: to jest modu³ eksperymentalny. - -%package pcntl -Summary: Process Control extension module for PHP -Summary(pl): Modu³ Process Control dla PHP -Group: Libraries -Requires(post,preun): %{name}-program = %{epoch}:%{version} -Requires: %{name}-program = %{epoch}:%{version} - -%description pcntl -This is a dynamic shared object (DSO) for Apache that will add process -spawning and control support to PHP. It supports functions like -fork(), waitpid(), signal() etc. - -Warning: this is an experimental module. Also, don't use it in -webserver environment! - -%description pcntl -l pl -Modu³ PHP umo¿liwiaj±cy tworzenie nowych procesów i kontrolê nad nimi. -Obs³uguje funkcje takie jak fork(), waitpid(), signal() i podobne. - -Uwaga: to jest modu³ eksperymentalny. Ponadto nie jest przeznaczony do -u¿ywania z serwerem WWW - nie próbuj tego! - -%package pcre -Summary: PCRE extension module for PHP -Summary(pl): Modu³ PCRE dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description pcre -This is a dynamic shared object (DSO) for Apache that will add Perl -Compatible Regular Expression support to PHP. - -%description pcre -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z perlowych wyra¿eñ regularnych -(Perl Compatible Regular Expressions) - -%package pdf -Summary: libPDF module for PHP -Summary(pl): Modu³ do tworzenia plików PDF dla PHP -Group: Libraries -PreReq: pdflib -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description pdf -This is a dynamic shared object (DSO) for Apache that will add PDF -support to PHP. - -%description pdf -l pl -Modu³ PHP umo¿liwiaj±cy tworzenie plików PDF. Wykorzystuje bibliotekê -pdflib. - -%package pgsql -Summary: PostgreSQL database module for PHP -Summary(pl): Modu³ bazy danych PostgreSQL dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description pgsql -This is a dynamic shared object (DSO) for Apache that will add -PostgreSQL database support to PHP. - -%description pgsql -l pl -Modu³ PHP umo¿liwiaj±cy dostêp do bazy danych PostgreSQL. - -%description pgsql -l pt_BR -Um módulo para aplicações PHP que usam bancos de dados postgresql. - -%package posix -Summary: POSIX extension module for PHP -Summary(pl): Modu³ POSIX dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description posix -This is a dynamic shared object (DSO) for Apache that will add POSIX -functions support to PHP. - -%description posix -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z funkcji POSIX. - -%package pspell -Summary: pspell extension module for PHP -Summary(pl): Modu³ pspell dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description pspell -This is a dynamic shared object (DSO) for Apache that will add pspell -support to PHP. It allows to check the spelling of a word and offer -suggestions. - -%description pspell -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z pspella. Pozwala on na -sprawdzanie pisowni s³owa i sugerowanie poprawek. - -%package recode -Summary: recode extension module for PHP -Summary(pl): Modu³ recode dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -Requires: recode >= 3.5d-3 - -%description recode -This is a dynamic shared object (DSO) for Apache that will add recode -support to PHP. - -%description recode -l pl -Modu³ PHP dodaj±cy mo¿liwo¶æ konwersji kodowania plików (poprzez -bibliotekê recode). - -%package session -Summary: session extension module for PHP -Summary(pl): Modu³ session dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description session -This is a dynamic shared object (DSO) for Apache that will add session -support to PHP. - -%description session -l pl -Modu³ PHP dodaj±cy obs³ugê sesji. - -%package shmop -Summary: Shared Memory Operations extension module for PHP -Summary(pl): Modu³ shmop dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description shmop -This is a dynamic shared object (DSO) for Apache that will add Shared -Memory Operations support to PHP. - -Warning: this is an experimental module. - -%description shmop -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z pamiêci dzielonej. - -Uwaga: to jest modu³ eksperymentalny. - -%package snmp -Summary: SNMP extension module for PHP -Summary(pl): Modu³ SNMP dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description snmp -This is a dynamic shared object (DSO) for Apache that will add SNMP -support to PHP. - -%description snmp -l pl -Modu³ PHP dodaj±cy obs³ugê SNMP. - -%package sockets -Summary: sockets extension module for PHP -Summary(pl): Modu³ socket dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description sockets -This is a dynamic shared object (DSO) for Apache that will add sockets -support to PHP. - -Warning: this is an experimental module. - -%description sockets -l pl -Modu³ PHP dodaj±cy obs³ugê gniazdek. - -Uwaga: to jest modu³ eksperymentalny. - -%package sybase-ct -Summary: Sybase-CT extension module for PHP -Summary(pl): Modu³ Sybase-CT dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description sybase-ct -This is a dynamic shared object (DSO) for Apache that will add Sybase -and MS SQL databases support through CT-lib to PHP. - -%description sybase-ct -l pl -Modu³ PHP dodaj±cy obs³ugê baz danych Sybase oraz MS SQL poprzez -CT-lib. - -%package sysvsem -Summary: SysV sem extension module for PHP -Summary(pl): Modu³ SysV sem dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description sysvsem -This is a dynamic shared object (DSO) for Apache that will add SysV -semafores support to PHP. - -%description sysvsem -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z semaforów SysV. - -%package sysvshm -Summary: SysV shm extension module for PHP -Summary(pl): Modu³ SysV shm dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description sysvshm -This is a dynamic shared object (DSO) for Apache that will add SysV -Shared Memory support to PHP. - -%description sysvshm -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z pamiêci dzielonej SysV. - -%package wddx -Summary: wddx extension module for PHP -Summary(pl): Modu³ wddx dla PHP -Group: Libraries -PreReq: %{name}-session = %{epoch}:%{version} -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description wddx -This is a dynamic shared object (DSO) for Apache that will add wddx -support to PHP. - -%description wddx -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z wddx. - -%package xml -Summary: XML extension module for PHP -Summary(pl): Modu³ XML dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description xml -This is a dynamic shared object (DSO) for Apache that will add XML -support to PHP. This extension lets you create XML parsers and then -define handlers for different XML events. - -%description xml -l pl -Modu³ PHP umo¿liwiaj±cy parsowanie plików XML i obs³ugê zdarzeñ -zwi±zanych z tymi plikami. Pozwala on tworzyæ analizatory XML i -nastêpnie definiowaæ procedury obs³ugi dla ró¿nych zdarzeñ XML. - -%package xmlrpc -Summary: xmlrpc extension module for PHP -Summary(pl): Modu³ xmlrpc dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description xmlrpc -This is a dynamic shared object (DSO) for Apache that will add XMLRPC -support to PHP. - -Warning: this is an experimental module. - -%description xmlrpc -l pl -Modu³ PHP dodaj±cy obs³ugê XMLRPC. - -Uwaga: to jest modu³ eksperymentalny. - -%package xslt -Summary: xslt extension module for PHP -Summary(pl): Modu³ xslt dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description xslt -This is a dynamic shared object (DSO) for Apache that will add xslt -support to PHP. - -%description xslt -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z technologii xslt. - -%package yaz -Summary: yaz extension module for PHP -Summary(pl): Modu³ yaz dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} -Requires: yaz >= 1.9 - -%description yaz -This is a dynamic shared object (DSO) for Apache that will add yaz -support to PHP. yaz toolkit implements the Z39.50 protocol for -information retrieval. - -%description yaz -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z yaz - implementacji protoko³u -Z39.50 s³u¿±cego do pozyskiwania informacji. - -%package yp -Summary: NIS (yp) extension module for PHP -Summary(pl): Modu³ NIS (yp) dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description yp -This is a dynamic shared object (DSO) for Apache that will add NIS -(Yellow Pages) support to PHP. - -%description yp -l pl -Dynamiczny obiekt wspó³dzielony (DSO) dla Apache'a, dodaj±cy do PHP -wsparcie dla NIS (Yellow Pages). - -%package zip -Summary: zip extension module for PHP -Summary(pl): Modu³ zip dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description zip -This is a dynamic shared object (DSO) for Apache that will add ZZipLib -(read-only access to ZIP archives) support to PHP. - -%description zip -l pl -Modu³ PHP umo¿liwiaj±cy korzystanie z bibliotekli ZZipLib -(pozwalaj±cej na odczyt archiwów ZIP). - -%package zlib -Summary: Zlib extension module for PHP -Summary(pl): Modu³ zlib dla PHP -Group: Libraries -Requires(post,preun): %{name}-common = %{epoch}:%{version} -Requires: %{name}-common = %{epoch}:%{version} - -%description zlib -This is a dynamic shared object (DSO) for Apache that will add -compression (zlib) support to PHP. - -%description zlib -l pl -Modu³ PHP umo¿liwiaj±cy u¿ywanie kompresji (poprzez bibliotekê zlib). - -%package pear -Summary: PEAR - PHP Extension and Application Repository -Summary(pl): PEAR - Rozszerzenie PHP i Repozytorium Aplikacji -Group: Development/Languages/PHP -Requires: %{name}-pcre = %{epoch}:%{version} -Requires: %{name}-xml = %{epoch}:%{version} -Obsoletes: %{name}-pear-additional_classes - -%description pear -PEAR - PHP Extension and Application Repository. - -%description pear -l pl -PEAR (PHP Extension and Application Repository) - Rozszerzenie PHP i -Repozytorium Aplikacji. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -#%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -cp php.ini-dist php.ini -%patch18 -p1 -# for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked -# conditionally... -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 - -%build -CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include" -EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR -./buildconf --force -%{__libtoolize} -%{__aclocal} -%{__autoconf} -PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL -for i in cgi cli apxs ; do -%configure \ - `[ $i = cgi ] && echo --enable-discard-path` \ - `[ $i = cli ] && echo --disable-cgi` \ - `[ $i = fcgi ] && echo --enable-fastcgi --with-fastcgi=/usr` \ -%if %{_apache2} - `[ $i = apxs ] && echo --with-apxs2=%{apxs}` \ -%else - `[ $i = apxs ] && echo --with-apxs=%{apxs}` \ -%endif - --with-config-file-path=%{_sysconfdir} \ - --with-exec-dir=%{_bindir} \ - --%{!?debug:dis}%{?debug:en}able-debug \ - --enable-memory-limit \ - --enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-ctype=shared \ - --enable-dba=shared \ - --enable-dbx=shared \ - --enable-dio=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd-native-ttf \ - --enable-magic-quotes \ - --enable-mbstring=shared --disable-mbstr-enc-trans --enable-mbregex \ - --enable-overload=shared \ - %{?_with_pcntl:--enable-pcntl=shared}%{!?_with_pcntl:--disable-pcntl} \ - --enable-posix=shared \ - --enable-session \ - --enable-shared \ - --enable-shmop=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --enable-track-vars \ - --enable-trans-sid \ - --enable-safe-mode \ - --enable-sockets=shared \ - --enable-ucd-snmp-hack \ - %{!?_without_wddx:--enable-wddx=shared} \ - %{?_without_xml:--disable-xml}%{!?_without_xml:--enable-xml=shared} \ - %{!?_without_xslt:--enable-xslt=shared} \ - --enable-yp=shared \ - --with-bz2=shared \ - %{!?_without_cpdf:--with-cpdflib=shared} \ - --with-crack=shared \ - %{?_without_curl:--without-curl}%{!?_without_curl:--with-curl=shared} \ - %{?_with_db3:--with-db3}%{!?_with_db3:--with-db4} \ - --with-dbase=shared \ - %{!?_without_xml:--with-dom=shared} \ - %{!?_without_domxslt:--with-dom-xslt=shared --with-dom-exslt=shared} \ -%if %(expr %{?_without_xml:0}%{!?_without_xml:1} + %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1}) - --with-expat-dir=shared,/usr \ -%else - --without-expat-dir \ -%endif - --with-iconv=shared \ - --with-filepro=shared \ - --with-freetype-dir=shared \ - --with-gettext=shared \ - --with-gd=shared,/usr \ - --with-gdbm \ - --with-gmp=shared \ - --with-hyperwave=shared \ - %{!?_without_imap:--with-imap=shared --with-imap-ssl} \ - %{!?_without_interbase:--with-interbase=shared%{!?_with_interbase_inst:,/usr}} \ - %{?_with_java:--with-java=/usr/lib/java} \ - --with-jpeg-dir=shared,/usr \ - %{!?_without_ldap:--with-ldap=shared} \ - --with-mcal=shared,/usr \ - --with-mcrypt=shared \ - %{!?_without_mhash:--with-mhash=shared} \ - %{!?_without_ming:--with-ming=shared} \ - %{!?_without_mm:--with-mm} \ - %{?_without_mnogosearch:--without-mnogosearch}%{!?_without_mnogosearch:--with-mnogosearch=shared,/usr} \ - %{!?_without_msession:--with-msession=shared}%{?_without_msession:--without-msession} \ - --with-mysql=shared,/usr \ - --with-mysql-sock=/var/lib/mysql/mysql.sock \ - %{?_with_oci8:--with-oci8=shared} \ - %{!?_without_openssl:--with-openssl} \ - %{?_with_oracle:--with-oracle=shared} \ - %{?_without_pcre:--without-pcre-regex}%{!?_without_pcre:--with-pcre-regex=shared} \ - %{!?_without_pdf:--with-pdflib=shared} \ - --with-pear=%{php_pear_dir} \ - %{?_without_pgsql:--without-pgsql}%{!?_without_pgsql:--with-pgsql=shared,/usr} \ - --with-png-dir=shared,/usr \ - %{!?_without_pspell:--with-pspell=shared} \ - %{!?_without_recode:--with-recode=shared} \ - --with-regex=php \ - --without-sablot-js \ - %{!?_without_snmp:--with-snmp=shared} \ - %{!?_without_sybase_ct:--with-sybase-ct=shared,/usr} \ - --with-t1lib=shared \ - --with-tiff-dir=shared,/usr \ - %{!?_without_odbc:--with-unixODBC=shared} \ - %{?_without_xmlrpc:--without-xmlrpc}%{!?_without_xmlrpc:--with-xmlrpc=shared,/usr} \ - %{!?_without_xslt:--with-xslt-sablot=shared} \ - %{!?_without_yaz:--with-yaz=shared} \ - --with-zip=shared \ - --with-zlib=shared \ - --with-zlib-dir=shared,/usr -# --with-openssl=shared not supported in 4.3.2 - -cp -f Makefile Makefile.$i -# left for debugging purposes -cp -f main/php_config.h php_config.h.$i -done - -# for now session_mm doesn't work with shared session module... -# --enable-session=shared -# %{?_without_mm:--with-mm=shared,no}%{!?_without_mm:--with-mm=shared} - -# TODO: -# --with-qtdom=shared - -%{__make} - -# fix install paths, avoid evil rpaths -%{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la -%{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}/apache'|" libphp4.la -%{__perl} -pi -e 's|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |' libphp4.la - -# notes: -# -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common) -# -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4 - -%{__make} sapi/cgi/php -f Makefile.cgi \ - CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1" - -# for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -# -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1 -# -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1 - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}} \ - $RPM_BUILD_ROOT%{httpdir}/icons \ - $RPM_BUILD_ROOT{%{_sbindir},%{_bindir}} \ - $RPM_BUILD_ROOT/var/run/php \ - $RPM_BUILD_ROOT/etc/httpd/httpd.conf - -%{__make} install \ - INSTALL_ROOT=$RPM_BUILD_ROOT \ - INSTALL_IT="\$(LIBTOOL) --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} ; \$(LIBTOOL) --mode=install install libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache ; \$(LIBTOOL) --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi" \ - INSTALL_CLI="\$(LIBTOOL) --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli" - -# compatibility (/usr/bin/php used to be CGI SAPI) -ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php - -%{?_with_java:install ext/java/php_java.jar $RPM_BUILD_ROOT%{extensionsdir}} - -install php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini -install %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir} -install %{SOURCE2} php.gif $RPM_BUILD_ROOT%{httpdir}/icons -install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir} -install %{SOURCE5} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf - -install %{SOURCE1} . - -cp -f Zend/LICENSE{,.Zend} - -# Directories created for pear: -install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Archive,Console,Crypt,HTML/Template,Image,Net,Science,XML} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%if ! %{_apache2} -%{__perl} -pi -e 's|^#AddType application/x-httpd-php \.php|AddType application/x-httpd-php .php|' \ - /etc/httpd/httpd.conf -%{apxs} -e -a -n php4 %{_pkglibdir}/libphp4.so 1>&2 -%endif -if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 -fi - -%if %{_apache2} -%postun -if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi -fi -%else -%preun -if [ "$1" = "0" ]; then - %{apxs} -e -A -n php4 %{_pkglibdir}/libphp4.so 1>&2 - %{__perl} -pi -e \ - 's|^AddType application/x-httpd-php \.php|#AddType application/x-httpd-php .php|' \ - /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi -fi -%endif - -%post common -p /sbin/ldconfig -%postun common -p /sbin/ldconfig - -%post bcmath -%{_sbindir}/php-module-install install bcmath %{_sysconfdir}/php.ini - -%preun bcmath -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove bcmath %{_sysconfdir}/php.ini -fi - -%post bzip2 -%{_sbindir}/php-module-install install bz2 %{_sysconfdir}/php.ini - -%preun bzip2 -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove bz2 %{_sysconfdir}/php.ini -fi - -%post calendar -%{_sbindir}/php-module-install install calendar %{_sysconfdir}/php.ini - -%preun calendar -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove calendar %{_sysconfdir}/php.ini -fi - -%post cpdf -%{_sbindir}/php-module-install install cpdf %{_sysconfdir}/php.ini - -%preun cpdf -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove cpdf %{_sysconfdir}/php.ini -fi - -%post crack -%{_sbindir}/php-module-install install crack %{_sysconfdir}/php.ini - -%preun crack -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove crack %{_sysconfdir}/php.ini -fi - -%post ctype -%{_sbindir}/php-module-install install ctype %{_sysconfdir}/php.ini - -%preun ctype -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove ctype %{_sysconfdir}/php.ini -fi - -%post curl -%{_sbindir}/php-module-install install curl %{_sysconfdir}/php.ini - -%preun curl -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove curl %{_sysconfdir}/php.ini -fi - -%post dba -%{_sbindir}/php-module-install install dba %{_sysconfdir}/php.ini - -%preun dba -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove dba %{_sysconfdir}/php.ini -fi - -%post dbase -%{_sbindir}/php-module-install install dbase %{_sysconfdir}/php.ini - -%preun dbase -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove dbase %{_sysconfdir}/php.ini -fi - -%post dbx -%{_sbindir}/php-module-install install dbx %{_sysconfdir}/php.ini - -%preun dbx -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove dbx %{_sysconfdir}/php.ini -fi - -%post dio -%{_sbindir}/php-module-install install dio %{_sysconfdir}/php.ini - -%preun dio -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove dio %{_sysconfdir}/php.ini -fi - -%post domxml -%{_sbindir}/php-module-install install domxml %{_sysconfdir}/php.ini - -%preun domxml -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove domxml %{_sysconfdir}/php.ini -fi - -%post exif -%{_sbindir}/php-module-install install exif %{_sysconfdir}/php.ini - -%preun exif -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove exif %{_sysconfdir}/php.ini -fi - -%post filepro -%{_sbindir}/php-module-install install filepro %{_sysconfdir}/php.ini - -%preun filepro -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove filepro %{_sysconfdir}/php.ini -fi - -%post ftp -%{_sbindir}/php-module-install install ftp %{_sysconfdir}/php.ini - -%preun ftp -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove ftp %{_sysconfdir}/php.ini -fi - -%post gd -%{_sbindir}/php-module-install install gd %{_sysconfdir}/php.ini - -%preun gd -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove gd %{_sysconfdir}/php.ini -fi - -%post gettext -%{_sbindir}/php-module-install install gettext %{_sysconfdir}/php.ini - -%preun gettext -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove gettext %{_sysconfdir}/php.ini -fi - -%post gmp -%{_sbindir}/php-module-install install gmp %{_sysconfdir}/php.ini - -%preun gmp -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove gmp %{_sysconfdir}/php.ini -fi - -%post hyperwave -%{_sbindir}/php-module-install install hyperwave %{_sysconfdir}/php.ini - -%preun hyperwave -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove hyperwave %{_sysconfdir}/php.ini -fi - -%post iconv -%{_sbindir}/php-module-install install iconv %{_sysconfdir}/php.ini - -%preun iconv -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove iconv %{_sysconfdir}/php.ini -fi - -%post imap -%{_sbindir}/php-module-install install imap %{_sysconfdir}/php.ini - -%preun imap -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove imap %{_sysconfdir}/php.ini -fi - -%post interbase -%{_sbindir}/php-module-install install interbase %{_sysconfdir}/php.ini - -%preun interbase -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove interbase %{_sysconfdir}/php.ini -fi - -%post java -%{_sbindir}/php-module-install install java %{_sysconfdir}/php.ini - -%preun java -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove java %{_sysconfdir}/php.ini -fi - -%post ldap -%{_sbindir}/php-module-install install ldap %{_sysconfdir}/php.ini - -%preun ldap -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove ldap %{_sysconfdir}/php.ini -fi - -%post mbstring -%{_sbindir}/php-module-install install mbstring %{_sysconfdir}/php.ini - -%preun mbstring -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mbstring %{_sysconfdir}/php.ini -fi - -%post mcal -%{_sbindir}/php-module-install install mcal %{_sysconfdir}/php.ini - -%preun mcal -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mcal %{_sysconfdir}/php.ini -fi - -%post mcrypt -%{_sbindir}/php-module-install install mcrypt %{_sysconfdir}/php.ini - -%preun mcrypt -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mcrypt %{_sysconfdir}/php.ini -fi - -%post mhash -%{_sbindir}/php-module-install install mhash %{_sysconfdir}/php.ini - -%preun mhash -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mhash %{_sysconfdir}/php.ini -fi - -%post ming -%{_sbindir}/php-module-install install ming %{_sysconfdir}/php.ini - -%preun ming -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove ming %{_sysconfdir}/php.ini -fi - -%post mnogosearch -%{_sbindir}/php-module-install install mnogosearch %{_sysconfdir}/php.ini - -%preun mnogosearch -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mnogosearch %{_sysconfdir}/php.ini -fi - -%post msession -%{_sbindir}/php-module-install install msession %{_sysconfdir}/php.ini - -%preun msession -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove msession %{_sysconfdir}/php.ini -fi - -%post mysql -%{_sbindir}/php-module-install install mysql %{_sysconfdir}/php.ini - -%preun mysql -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove mysql %{_sysconfdir}/php.ini -fi - -%post oci8 -%{_sbindir}/php-module-install install oci8 %{_sysconfdir}/php.ini - -%preun oci8 -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove oci8 %{_sysconfdir}/php.ini -fi - -%post odbc -%{_sbindir}/php-module-install install odbc %{_sysconfdir}/php.ini - -%preun odbc -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove odbc %{_sysconfdir}/php.ini -fi - -%post openssl -%{_sbindir}/php-module-install install openssl %{_sysconfdir}/php.ini - -%preun openssl -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove openssl %{_sysconfdir}/php.ini -fi - -%post oracle -%{_sbindir}/php-module-install install oracle %{_sysconfdir}/php.ini - -%preun oracle -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove oracle %{_sysconfdir}/php.ini -fi - -%post overload -%{_sbindir}/php-module-install install overload %{_sysconfdir}/php.ini - -%preun overload -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove overload %{_sysconfdir}/php.ini -fi - -%post pcntl -if [ -f %{_sysconfdir}/php-cgi.ini ]; then -%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cgi.ini -fi -if [ -f %{_sysconfdir}/php-cli.ini ]; then -%{_sbindir}/php-module-install install pcntl %{_sysconfdir}/php-cli.ini -fi - -%preun pcntl -if [ "$1" = "0" ]; then - if [ -f %{_sysconfdir}/php-cgi.ini ]; then - %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cgi.ini - fi - if [ -f %{_sysconfdir}/php-cli.ini ]; then - %{_sbindir}/php-module-install remove pcntl %{_sysconfdir}/php-cli.ini - fi -fi - -%post pcre -%{_sbindir}/php-module-install install pcre %{_sysconfdir}/php.ini - -%preun pcre -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove pcre %{_sysconfdir}/php.ini -fi - -%post pdf -%{_sbindir}/php-module-install install pdf %{_sysconfdir}/php.ini - -%preun pdf -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove pdf %{_sysconfdir}/php.ini -fi - -%post pgsql -%{_sbindir}/php-module-install install pgsql %{_sysconfdir}/php.ini - -%preun pgsql -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove pgsql %{_sysconfdir}/php.ini -fi - -%post posix -%{_sbindir}/php-module-install install posix %{_sysconfdir}/php.ini - -%preun posix -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove posix %{_sysconfdir}/php.ini -fi - -%post pspell -%{_sbindir}/php-module-install install pspell %{_sysconfdir}/php.ini - -%preun pspell -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove pspell %{_sysconfdir}/php.ini -fi - -%post recode -%{_sbindir}/php-module-install install recode %{_sysconfdir}/php.ini - -%preun recode -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove recode %{_sysconfdir}/php.ini -fi - -%post session -%{_sbindir}/php-module-install install session %{_sysconfdir}/php.ini - -%preun session -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove session %{_sysconfdir}/php.ini -fi - -%post shmop -%{_sbindir}/php-module-install install shmop %{_sysconfdir}/php.ini - -%preun shmop -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove shmop %{_sysconfdir}/php.ini -fi - -%post snmp -%{_sbindir}/php-module-install install snmp %{_sysconfdir}/php.ini - -%preun snmp -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove snmp %{_sysconfdir}/php.ini -fi - -%post sockets -%{_sbindir}/php-module-install install sockets %{_sysconfdir}/php.ini - -%preun sockets -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove sockets %{_sysconfdir}/php.ini -fi - -%post sybase-ct -%{_sbindir}/php-module-install install sybase_ct %{_sysconfdir}/php.ini - -%preun sybase-ct -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove sybase_ct %{_sysconfdir}/php.ini -fi - -%post sysvsem -%{_sbindir}/php-module-install install sysvsem %{_sysconfdir}/php.ini - -%preun sysvsem -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove sysvsem %{_sysconfdir}/php.ini -fi - -%post sysvshm -%{_sbindir}/php-module-install install sysvshm %{_sysconfdir}/php.ini - -%preun sysvshm -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove sysvshm %{_sysconfdir}/php.ini -fi - -%post wddx -%{_sbindir}/php-module-install install wddx %{_sysconfdir}/php.ini - -%preun wddx -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove wddx %{_sysconfdir}/php.ini -fi - -%post xml -%{_sbindir}/php-module-install install xml %{_sysconfdir}/php.ini - -%preun xml -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove xml %{_sysconfdir}/php.ini -fi - -%post xmlrpc -%{_sbindir}/php-module-install install xmlrpc %{_sysconfdir}/php.ini - -%preun xmlrpc -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove xmlrpc %{_sysconfdir}/php.ini -fi - -%post xslt -%{_sbindir}/php-module-install install xslt %{_sysconfdir}/php.ini - -%preun xslt -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove xslt %{_sysconfdir}/php.ini -fi - -%post yaz -%{_sbindir}/php-module-install install yaz %{_sysconfdir}/php.ini - -%preun yaz -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove yaz %{_sysconfdir}/php.ini -fi - -%post yp -%{_sbindir}/php-module-install install yp %{_sysconfdir}/php.ini - -%preun yp -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove yp %{_sysconfdir}/php.ini -fi - -%post zip -%{_sbindir}/php-module-install install zip %{_sysconfdir}/php.ini - -%preun zip -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove zip %{_sysconfdir}/php.ini -fi - -%post zlib -%{_sbindir}/php-module-install install zlib %{_sysconfdir}/php.ini - -%preun zlib -if [ "$1" = "0" ]; then - %{_sbindir}/php-module-install remove zlib %{_sysconfdir}/php.ini -fi - -%files -%defattr(644,root,root,755) -%if %{_apache2} -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php.conf -%endif -%attr(755,root,root) %{_libdir}/apache/libphp4.so -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini - -%files cgi -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/php.cgi -%attr(755,root,root) %{_bindir}/php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi.ini - -%files cli -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/php.cli -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cli.ini - -%files common -%defattr(644,root,root,755) -%doc php.ini-* -%doc CODING_STANDARDS CREDITS Zend/ZEND_CHANGES -%doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO* -%doc README.EXT_SKEL README.SELF-CONTAINED-EXTENSIONS - -%dir %{_sysconfdir} -%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php.ini -%attr(730,root,http) %dir %verify(not group mode) /var/run/php - -%{httpdir}/icons/* -%attr(755,root,root) %{_sbindir}/* -%attr(755,root,root) %{_libdir}/libphp_common-*.so -%dir %{extensionsdir} - -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/phpextdist -%attr(755,root,root) %{_bindir}/phpize -%attr(755,root,root) %{_bindir}/php-config -%attr(755,root,root) %{_libdir}/libphp_common.so -%{_libdir}/libphp_common.la -%{_includedir}/php -%{_libdir}/php/build - -%files bcmath -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/bcmath.so - -%files bzip2 -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/bz2.so - -%files calendar -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/calendar.so - -%if %{?_without_cpdf:0}%{!?_without_cpdf:1} -%files cpdf -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/cpdf.so -%endif - -%files crack -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/crack.so - -%files ctype -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/ctype.so - -%if %{!?_without_curl:1}%{?_without_curl:0} -%files curl -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/curl.so -%endif - -%files dba -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/dba.so - -%files dbase -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/dbase.so - -%files dbx -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/dbx.so - -%files dio -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/dio.so - -%if 0%{!?_without_xml:1} -%files domxml -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/domxml.so -%endif - -%files exif -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/exif.so - -%files filepro -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/filepro.so - -%files ftp -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/ftp.so - -%files gd -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/gd.so - -%files gettext -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/gettext.so - -%files gmp -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/gmp.so - -%files hyperwave -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/hyperwave.so - -%files iconv -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/iconv.so - -%if %{?_without_imap:0}%{!?_without_imap:1} -%files imap -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/imap.so -%endif - -%if %{?_without_interbase:0}%{!?_without_interbase:1} -%files interbase -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/interbase.so -%endif - -%if %{?_with_java:1}%{!?_with_java:0} -%files java -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/java.so -%{extensionsdir}/php_java.jar -%endif - -%if %{?_without_ldap:0}%{!?_without_ldap:1} -%files ldap -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/ldap.so -%endif - -%files mbstring -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mbstring.so - -%files mcal -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mcal.so - -%files mcrypt -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mcrypt.so - -%if %{!?_without_mhash:1}%{?_without_mhash:0} -%files mhash -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mhash.so -%endif - -%if %{!?_without_ming:1}%{?_without_ming:0} -%files ming -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/ming.so -%endif - -%if %{!?_without_mnogosearch:1}%{?_without_mnogosearch:0} -%files mnogosearch -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mnogosearch.so -%endif - -%if %{?_without_msession:0}%{!?_without_msession:1} -%files msession -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/msession.so -%endif - -%files mysql -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/mysql.so - -%if %{?_with_oci8:1}%{!?_with_oci8:0} -%files oci8 -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/oci8.so -%endif - -%if %{?_without_odbc:0}%{!?_without_odbc:1} -%files odbc -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/odbc.so -%endif - -# shared openssl module not supported in 4.3.2 -#%if %{?_without_openssl:0}%{!?_without_openssl:1} -#%files openssl -#%defattr(644,root,root,755) -#%attr(755,root,root) %{extensionsdir}/openssl.so -#%endif - -%if %{?_with_oracle:1}%{!?_with_oracle:0} -%files oracle -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/oracle.so -%endif - -%files overload -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/overload.so - -%if %{?_with_pcntl:1}%{!?_with_pcntl:0} -%files pcntl -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/pcntl.so -%endif - -%if %{?_without_pcre:0}%{!?_without_pcre:1} -%files pcre -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/pcre.so -%endif - -%if %{?_without_pdf:0}%{!?_without_pdf:1} -%files pdf -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/pdf.so -%endif - -%if %{!?_without_pgsql:1}%{?_without_pgsql:0} -%files pgsql -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/pgsql.so -%endif - -%files posix -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/posix.so - -%if %{!?_without_pspell:1}%{?_without_pspell:0} -%files pspell -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/pspell.so -%endif - -%if %{?_without_recode:0}%{!?_without_recode:1} -%files recode -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/recode.so -%endif - -# session_mm doesn't work with shared session -#%files session -#%defattr(644,root,root,755) -#%attr(755,root,root) %{extensionsdir}/session.so - -%files shmop -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/shmop.so - -%if %{?_without_snmp:0}%{!?_without_snmp:1} -%files snmp -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/snmp.so -%endif - -%files sockets -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/sockets.so - -%if %{?_without_sybase_ct:0}%{!?_without_sybase_ct:1} -%files sybase-ct -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/sybase_ct.so -%endif - -%files sysvsem -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/sysvsem.so - -%files sysvshm -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/sysvshm.so - -%if %{?_without_wddx:0}%{!?_without_wddx:1} -%files wddx -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/wddx.so -%endif - -%if %{?_without_xml:0}%{!?_without_xml:1} -%files xml -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/xml.so -%endif - -%if %{?_without_xmlrpc:0}%{!?_without_xmlrpc:1} -%files xmlrpc -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/xmlrpc.so -%endif - -%if %{?_without_xslt:0}%{!?_without_xslt:1} -%files xslt -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/xslt.so -%endif - -%if 0%{!?_without_yaz:1} -%files yaz -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/yaz.so -%endif - -%files yp -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/yp.so - -%files zip -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/zip.so - -%files zlib -%defattr(644,root,root,755) -%attr(755,root,root) %{extensionsdir}/zlib.so - -%files pear -%defattr(644,root,root,755) -%dir %{php_pear_dir} -%dir %{php_pear_dir}/Archive -%dir %{php_pear_dir}/Console -%dir %{php_pear_dir}/Crypt -%dir %{php_pear_dir}/HTML -%dir %{php_pear_dir}/HTML/Template -%dir %{php_pear_dir}/Image -%dir %{php_pear_dir}/Net -%dir %{php_pear_dir}/Science -%dir %{php_pear_dir}/XML diff --git a/zend.gif b/zend.gif deleted file mode 100644 index a2b4379c6a238eb50c4894e21e3444f7044def0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4440 zcmWla4OEin`^O*P0UmjMgfeQWU{+GTfLcn4KH?k0Qid&yUo8|@F04q*m9&P4FBK&j zD`%{*Vrfa?jA|`Q)0nGfR7S0pL$k2#OjR7m&@bvjE|4|YlEI~ zoP{i_zjy>-*Klajrne zUL(jT61CnmE)c0yx^EaiIt6WlrOC+_6q@4nZl_#=t1r~wS z!xi|&NZC9Si>rrVfxUCWV)YnJE}hxACuGFiqgR=>yzo!+n0BUe}zD!y2$DmrRw^|(vzk`E59#6pK@=PYX z!{O2EEq1$0>UY!SvsfGwi9b0st5Q7ytl7`Zw_Zvj9N; zVF;Kmw3)lBAo`pYeYWPF+6xUctNyhOcYkq#fV)=QE>Dw(>ZfKuX@AtGot=F=shE_n zS>uQ}S@H&z-`y0aBE&nMhn}MLZvA(`zQ9M<0CYuwcZ+`X(igvJd5`ZHAEm7MRdzqT zxNUii9({;MAASCPfBmmo*4*+t_hMzCAYx~^n4$vF>BYN2)L!TjV-cnL@#)ayQ zrH_dT#as$%cw=JuK9*2^1N|P8`F60c@Yjl6&n?4;b`(4J>z=5UuCY}b zBPIpxAh*qL-*ZlnwYJ%2<~R5ZSryX2K@y3ey_ zcj&c)n4M9Nu=HtP$gT?{TYs@W|KgQzpLNZlcE(T8=ApBlK%hMThm-Gq&~gj>a9zARhaA#dk9Wz^)+AR*dvg~ut`FoU zjgDYie(-ts)+ZY)+$anAJM-^kQ|w4?vRHUL?=W_YI5WBApSaZI1IK*>RO;{pH}z1# zFyYC`g87V5^XI0$GtDhwPf?+7HaitnQ%3hj9=kiDTHG!iG}O=;Zp;b%MA@HFXa920 zbAglprq!~3L|0Ur-+J4#k|*?^bn)MLo2hop!?fJQ$6Yc?3+4q~gD(LKcP(VxllNRE z#Vw-pZb=2#GrDJcNSqO=Cx?usjil|{t=i3}KbT=9 zmuzmhMmxBSn-R1ocjMJRTFX+=!DW&Eki*}ObmS&~I``d|I^jP)dOcoPe3=l~DC1Pk zYP|05zA`zApG)@+#9?p@#)~xC$&rR$nn`u>ElsProH1pjkrlwdc`MIBp3*pF6dSUF zeo8-~+tU8ShtZDpRo||P!^}FdwS7lmW{UuyeD~EfWmW9(HgfnK1HCG|1c|K<{TTo> zb02KD@y(NM!gi3d@{Jx0Ze;dnPJY>!m&5zhsY*?QWDk*Vw&E%ljCpUaWSn=YY1E=1fp@u*B9g|?wFnqI8bquAus&|<#kkeet4<8Hp zh}`Fg3tKG@yMq4`XVSC-2F%DXb@iJb*0gp)SaBgvs9ARU1R*dx<&p;Rbc_;gNC{}?!jDQC>YKz`=9nix@xN^%n+96v83PJ!}csDiMeK5A@<_uIk zGPSj?m&k3t#?_&ys=A&Tl5T90yZP8AuORrjtajnid6Vn!31-wFps4_Ta0|>1dDd0E z3pfW%Z<4HuT48z#)Mf&F?z z9$h&E->&Q0+xP;E@=Y3oGWxXBPAhex#XVDVk0bFb+*nq+0E!7N3CSCgt3J&l=> z+NSE5fh8ohxTtUVW>U`EsL-+&93^L{E+Zn0xDM`}^*d*0rT>3f?G~(h$_bz`Cjx`r zhml4WT6DU3>WjooI!*?o%49^}(G$VLT_8r8$6OhFeC8|7%7*S8ztpdN((5wlQq03g zQ=QtWx*>e3Sk{DDheV5pu#tZhYUlLr)<$_N0+j>wpP9@b?w4%0{O?LvkN zG$51di$K+32@!}!3o}sxUDOnlQkUJ^OnpG7wJEgxl4Nf}xPfFd826=Oyb_hXH9soEFs0~81x@c|4c99r`of_N{F=r3vdyX8F z-vZ8T(_pSpmRxS?Lds`cdzcm1_vI9GZQ#9T((eUAW;gUTP52r3b7}XaVxM6g|V^1n&1FM>0V0+lB$-Gs9m4t^{DWwy8yow_(f{!~*md(M{Dn7 zD`YkF#%B6rMjbHSO`x5vv~Bdppw3Oz{IoxK8ta_y`klXV2Ygk)jK(dO9&5DHQ!)_c z$%q)}pO_0R0j@AL?YbPJfS_L`m~@m`q=n4W z6#KV)LNjcTw5)vc-7>)szIJU06JcVDtFEt!Ayg7x6JwH|g)Frvf*GC64_yd-Y2)rt z(_!+udzEUGjM)DJ!ng|8%x!>o^eaA))_(i*Cnw$IXkjJI=>Ek=Tl!bUt^a!Ob|k#} z>%@PTpU)}#?O}#6X+2Oq>)a87LD?())4Y2O)S&M7Y|Vd-|3*xVfC)dr#JiP1yHnF{ z1HNJ6`|<;1&hmu)+xE+FBU1?NOc?FO#AT_43F1}`crYF#yb`rAJYt}nvcO4+6JvMT zzO`sVAsZjP8GS}vjAo*mIq22q^;p@aY#A<_12rqLihR}ES=g<|%BMxZbCqTJbTaqX zua^L*)Ys4+1kccbLUYjsvV8sJq`OMW9UJ9uCG^Z4@EHdx*|P!Fw{^Ce|J%RR(;TS& zEPx3liImv&PMicGKV;(9CR8Nkm&GP*L#L959PD8c;vK=3?QD z1TW~)U?R+<^GuRm`6&pKaONGy&+UlasJQCf`1Kp=AWXX7Mcx!dy#?U+%PKd_CS)8d z|Hf7^pbX$U31S**A%MOFZy5{1?B!tKyoHR8lzp+7Wp1brfvTOT$*IKIUVO7R;1ghG z+CH+;j9vdLaXXT~Q3+0+U#0z?X^9JM(rKMo_O1 zw1z{(%7FOgd*^T2i}QI2S8dqylfdTys$B+P!~!frBpWcTGJLC&7~cxyDp#!H_Jjeo{~`qm9)GC`deZ_p&4FyL1* zF|khQZy9(ZBWa(z@FjvrfP}UTFrpeO$L7AD1ny>HcDgAgKmx+VJ-v+-_zD9PIMly2 zxG^!6m`AOb;eM78XTv-HVINw)584OMV{}1loY18XLXkKxDUbS1IPQ5-Vlq9g5J+g0 zRa*QS<=JLoX~54`&NuL zFww=j>)-t-bVpAn zWR>kGS~~}K44nHgEao;Y{bLn(0;X*3NWtV$i#2GMuZvP6gT~<2hVvA$hB9Z%zHL?1 z!^@93jxO4S$>J};y#cZ|lwmeCtqeaBwc%NG#nCKgTH2*Bc(O6_(*BrN;*1FZD>C3b zPD+fJ8pEN+z-=#?ZE?yb%J70W0JcQj+*FGCtCaoe>$bcl35(vP<&B`q^N#&}3%Onf zPjL#ZFK3>;za-8L{_nOhAv|?#?MCn>Rqdt}Y7!p(lt!k_8WBWaq*3Xz&FGgA>wBXz z^Vla#Q^=P3yYQS48)nqj@V4m`SyGP1e6`^xYKfE5b}R9_u!ud~E0=Y|-<)qlv#2-R zsCUQXKe@&%mt%$u(Y&DrQ+9+u+CJ}*7p>