diff options
| -rw-r--r-- | php/INSTALL | 18 | ||||
| -rw-r--r-- | php/patch.txt | 19 |
2 files changed, 33 insertions, 4 deletions
diff --git a/php/INSTALL b/php/INSTALL index ec3e47645dd..9da7e8ceb2b 100644 --- a/php/INSTALL +++ b/php/INSTALL @@ -87,8 +87,9 @@ Please refer to the PHP documentation for more information. Source patches -------------- -A patch is provided in the IcePHP source distribution to correct -a link error: +There are a couple of issues in the PHP sources that cause problems +for C++ compilers. A patch is provided in the IcePHP source distribution +to correct these problems: $ cd <phpdir> $ patch -p0 < <icephpdir>/patch.txt @@ -96,8 +97,12 @@ $ patch -p0 < <icephpdir>/patch.txt Solaris users should run 'gpatch' instead of 'patch'. If you don't have the patch utility or prefer to make the changes -manually, then you must edit the file Zend/zend_interfaces.h and -scroll down to the lines shown below: +manually, then you must edit two files: + + * Zend/zend_interfaces.h + * main/network.c + +Edit Zend/zend_interfaces.h and scroll down to the lines shown below: ZEND_API zend_class_entry *zend_ce_traversable; ZEND_API zend_class_entry *zend_ce_aggregate; @@ -106,6 +111,11 @@ ZEND_API zend_class_entry *zend_ce_arrayaccess; Change each occurrence of "ZEND_API" to "extern" in these four lines. +Edit main/network.c and change line and change line 829 to the +following: + +if (*error_code == PHP_TIMEOUT_ERROR_VALUE) { + Platform-specific Issues ------------------------ diff --git a/php/patch.txt b/php/patch.txt index 1d68d47f417..2e758ded6ed 100644 --- a/php/patch.txt +++ b/php/patch.txt @@ -23,3 +23,22 @@ typedef struct _zend_user_iterator { zend_object_iterator it; +*** main/network.c Thu Jan 8 03:17:53 2004 +--- main/network.c Tue Feb 24 12:19:44 2004 +*************** +*** 826,832 **** + } + } + #else +! if (err == PHP_TIMEOUT_ERROR_VALUE) { + /* Don't even bother trying to connect to the next alternative; + * we have no way to determine how long we have already taken + * and it is quite likely that the next attempt will fail too. */ +--- 826,832 ---- + } + } + #else +! if (*error_code == PHP_TIMEOUT_ERROR_VALUE) { + /* Don't even bother trying to connect to the next alternative; + * we have no way to determine how long we have already taken + * and it is quite likely that the next attempt will fail too. */ |