[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Tue Feb 4 20:32:43 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1256 php4/ChangeLog:1.1257 --- php4/ChangeLog:1.1256 Mon Feb 3 20:32:08 2003 +++ php4/ChangeLog Tue Feb 4 20:32:42 2003 @@ -1,3 +1,85 @@ +2003-02-04 Stig Bakken [EMAIL PROTECTED] + +* pear/package-PEAR.xml: + - replace @bin_dir@ in pear.bat + +2003-02-04 Sara Golemon [EMAIL PROTECTED] + +* (PHP_4_3) + ext/bcmath/bcmath.c: + FMH(r-1.49/r-1.50) + +2003-02-04 Andi Gutmans [EMAIL PROTECTED] + +* ext/bcmath/bcmath.c: + - Please follow coding standards (this isn't java :) + +2003-02-04 Marcus Boerger [EMAIL PROTECTED] + +* ext/bcmath/bcmath.c: + fix ZTS build + +2003-02-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* sapi/apache/mod_php4.c + sapi/apache_hooks/mod_php4.c: + Fixed compilation of Apache Apache Hooks SAPIs. + +2003-02-04 Marcus Boerger [EMAIL PROTECTED] + +* sapi/cli/php_cli.c: + remove it thenthis forces to put work in man page ... + +2003-02-04 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + reorder the bug fixes (reverse #). added missing bug fixing news + +2003-02-04 Sara Golemon [EMAIL PROTECTED] + +* ext/bcmath/bcmath.c: + Bug#13551 bcmath functions should not apply scale to arguments, only to + result + +2003-02-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Bug fixing news. + +* ext/pgsql/pgsql.c: + Made the row parameter in pg_result_seek() non-optional, the current + implementation would result in random behavior if the 2nd argument is not + passed. + Fixed bug #22042 (pg_result_seek() would never seek to the 1st row in the + result due to always seeking to row next to the one requested). + Removed dead code from pg_result_seek(). + +2003-02-04 Zeev Suraski [EMAIL PROTECTED] + +* ext/standard/aggregation.c + sapi/apache/mod_php4.c + sapi/apache_hooks/mod_php4.c: + Updates reflecting infrastructure changes + +2003-02-04 Uwe Steinmann [EMAIL PROTECTED] + +* ext/pdf/pdf.c: + - fixed some prototypes and folding + +* ext/pdf/pdf.c: + - fixed prototype of pdf_get_buffer() + +2003-02-04 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Added missing bugfix news entry. + +* NEWS: + NEWS ordering.. + 2003-02-03 Hartmut Holzgraefe [EMAIL PROTECTED] * main/output.c:
[PHP-CVS] cvs: php4 / NEWS
sniper Tue Feb 4 05:08:42 2003 EDT Modified files: /php4 NEWS Log: NEWS ordering.. Index: php4/NEWS diff -u php4/NEWS:1.1316 php4/NEWS:1.1317 --- php4/NEWS:1.1316Mon Feb 3 20:32:24 2003 +++ php4/NEWS Tue Feb 4 05:08:41 2003 @@ -1,10 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- Added command line parameters -B, -F, -R and -E which allow to process - stdin line by line (See php -h for more). (marcus) -- Added XBM support for bundled gd library. (marcus) -- Added XBM support for GetImageSize(). (helly) - Fixed bug #20155 (xmlrpc compile problem with ZE2). (Derick, Jan Schneider) - Fixed bug #20442 (upgraded bundled expat to 1.95.5). (Ilia) - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) @@ -12,6 +8,8 @@ (Marcus) - Improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) - Improved array_search() to accept objects as a needle under ZE2. (Moriyoshi) +- Added command line parameters -B, -F, -R and -E which allow to process + stdin line by line (See php -h for more). (Marcus) - Added string.base64 stream filter. (Moriyoshi) - Added domxml_node_get_path() (Lukas Schröder) - Added iconv related functions (Moriyoshi) @@ -25,6 +23,8 @@ . Support for float modifier. . Detection of numeric values inside strings passed as high low. . Proper handle the situations where high == low. +- Added XBM support for GetImageSize(). (Marcus) +- Added XBM support for bundled GD library. (Marcus) - Added imagefilter() function which allows application of various filters. This function is only available with bundled GD. (Pierre-Alain Joye, Ilia) - Added imageistruecolor(), only available with GD2. (Pierre-Alain Joye) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
sniper Tue Feb 4 05:10:25 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Added missing bugfix news entry. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.58 php4/NEWS:1.1247.2.59 --- php4/NEWS:1.1247.2.58 Mon Feb 3 12:01:16 2003 +++ php4/NEWS Tue Feb 4 05:10:25 2003 @@ -16,6 +16,8 @@ (Maxim) - Fixed bug #13561 (--without-pear disabled phpize/php-config install). (Jani) - Fixed bug #14532 (fixed connection_status() to return 2 for timeouts). (Jani) +- Fixed bug #16798 (Compile failure with LOB support for Oracle version 8.1). + (Maxim) - Fixed bug #17098 (make Apache2 aware that PHP scripts should not be cached). (Ilia) - Fixed bug #17868 (multiple !--include-- used to include PHP files crashes). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pdf pdf.c
steinm Tue Feb 4 05:23:12 2003 EDT
Modified files:
/php4/ext/pdf pdf.c
Log:
- fixed prototype of pdf_get_buffer()
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.118 php4/ext/pdf/pdf.c:1.119
--- php4/ext/pdf/pdf.c:1.118Sat Jan 18 19:45:44 2003
+++ php4/ext/pdf/pdf.c Tue Feb 4 05:23:11 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdf.c,v 1.118 2003/01/19 00:45:44 iliaa Exp $ */
+/* $Id: pdf.c,v 1.119 2003/02/04 10:23:11 steinm Exp $ */
/* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -332,7 +332,7 @@
#else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
#endif
- php_info_print_table_row(2, Revision, $Revision: 1.118 $ );
+ php_info_print_table_row(2, Revision, $Revision: 1.119 $ );
php_info_print_table_end();
}
@@ -2342,7 +2342,7 @@
/* }}} */
-/* {{{ proto int pdf_get_buffer(int pdfdoc)
+/* {{{ proto string pdf_get_buffer(int pdfdoc)
Fetches the full buffer containig the generated PDF data */
PHP_FUNCTION(pdf_get_buffer)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/pdf pdf.c
steinm Tue Feb 4 05:57:34 2003 EDT
Modified files:
/php4/ext/pdf pdf.c
Log:
- fixed some prototypes and folding
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.119 php4/ext/pdf/pdf.c:1.120
--- php4/ext/pdf/pdf.c:1.119Tue Feb 4 05:23:11 2003
+++ php4/ext/pdf/pdf.c Tue Feb 4 05:57:34 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: pdf.c,v 1.119 2003/02/04 10:23:11 steinm Exp $ */
+/* $Id: pdf.c,v 1.120 2003/02/04 10:57:34 steinm Exp $ */
/* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -332,7 +332,7 @@
#else
php_info_print_table_row(2, PDFlib GmbH Version, tmp );
#endif
- php_info_print_table_row(2, Revision, $Revision: 1.119 $ );
+ php_info_print_table_row(2, Revision, $Revision: 1.120 $ );
php_info_print_table_end();
}
@@ -444,7 +444,7 @@
}
/* }}} */
-/* {{{ proto int pdf_open([int filedesc])
+/* {{{ proto resource 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)
{
@@ -2242,7 +2242,7 @@
/* RJS: START OF NEW CODE */
-/* {{{ proto int pdf_new()
+/* {{{ proto resource pdf_new()
Creates a new PDF object */
PHP_FUNCTION(pdf_new)
{
@@ -2256,7 +2256,6 @@
ZEND_REGISTER_RESOURCE(return_value, pdf, le_pdf);
}
-
/* }}} */
/* {{{ proto int pdf_get_majorversion()
@@ -2269,6 +2268,7 @@
RETURN_LONG(PDF_get_majorversion());
}
+/* }}} */
/* {{{ proto int pdf_get_minorversion()
Returns the minor version number of the PDFlib */
@@ -2280,8 +2280,8 @@
RETURN_LONG(PDF_get_minorversion());
}
-
/* }}} */
+
/* {{{ proto bool pdf_delete(int pdfdoc)
Deletes the PDF object */
PHP_FUNCTION(pdf_delete)
@@ -2298,7 +2298,6 @@
RETURN_TRUE;
}
-
/* }}} */
/* {{{ proto int pdf_open_file(int pdfdoc [, char filename])
@@ -2339,7 +2338,6 @@
RETURN_TRUE;
}
-
/* }}} */
/* {{{ proto string pdf_get_buffer(int pdfdoc)
@@ -2361,7 +2359,6 @@
RETURN_STRINGL((char *)buffer, size, 1);
}
-
/* }}} */
/* {{{ proto int pdf_findfont(int pdfdoc, string fontname, string encoding [, int
embed])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4(PHP_4_3) / NEWS
Thanks! -- Maxim Maletsky [EMAIL PROTECTED] Jani Taskinen [EMAIL PROTECTED] wrote... : sniperTue Feb 4 05:10:25 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Added missing bugfix news entry. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.58 php4/NEWS:1.1247.2.59 --- php4/NEWS:1.1247.2.58 Mon Feb 3 12:01:16 2003 +++ php4/NEWS Tue Feb 4 05:10:25 2003 @@ -16,6 +16,8 @@ (Maxim) - Fixed bug #13561 (--without-pear disabled phpize/php-config install). (Jani) - Fixed bug #14532 (fixed connection_status() to return 2 for timeouts). (Jani) +- Fixed bug #16798 (Compile failure with LOB support for Oracle version 8.1). + (Maxim) - Fixed bug #17098 (make Apache2 aware that PHP scripts should not be cached). (Ilia) - Fixed bug #17868 (multiple !--include-- used to include PHP files crashes). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard aggregation.c /sapi/apache mod_php4.c /sapi/apache_hooks mod_php4.c
zeevTue Feb 4 08:12:48 2003 EDT
Modified files:
/php4/ext/standard aggregation.c
/php4/sapi/apache mod_php4.c
/php4/sapi/apache_hooks mod_php4.c
Log:
Updates reflecting infrastructure changes
Index: php4/ext/standard/aggregation.c
diff -u php4/ext/standard/aggregation.c:1.15 php4/ext/standard/aggregation.c:1.16
--- php4/ext/standard/aggregation.c:1.15Sun Jan 12 13:42:16 2003
+++ php4/ext/standard/aggregation.c Tue Feb 4 08:12:47 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: aggregation.c,v 1.15 2003/01/12 18:42:16 stas Exp $ */
+/* $Id: aggregation.c,v 1.16 2003/02/04 13:12:47 zeev Exp $ */
#include php.h
#include basic_functions.h
@@ -391,13 +391,16 @@
zend_hash_init(new_ce-class_table, 10, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(new_ce-class_table, Z_OBJCE_P(obj)-class_table,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
+ /*
zend_hash_init(new_ce-private_properties, 10, NULL, ZVAL_PTR_DTOR,
0);
zend_hash_copy(new_ce-private_properties,
Z_OBJCE_P(obj)-private_properties, (copy_ctor_func_t) zval_add_ref, (void *) tmp,
sizeof(zval *));
+ */
new_ce-constructor = Z_OBJCE_P(obj)-constructor;
new_ce-destructor = Z_OBJCE_P(obj)-destructor;
new_ce-clone = Z_OBJCE_P(obj)-clone;
#endif
+
new_ce-builtin_functions = Z_OBJCE_P(obj)-builtin_functions;
#ifndef ZEND_ENGINE_2
new_ce-handle_function_call = Z_OBJCE_P(obj)-handle_function_call;
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.151 php4/sapi/apache/mod_php4.c:1.152
--- php4/sapi/apache/mod_php4.c:1.151 Tue Jan 21 06:03:58 2003
+++ php4/sapi/apache/mod_php4.c Tue Feb 4 08:12:48 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.151 2003/01/21 11:03:58 sas Exp $ */
+/* $Id: mod_php4.c,v 1.152 2003/02/04 13:12:48 zeev Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -672,8 +672,15 @@
/* {{{ should_overwrite_per_dir_entry
*/
-static zend_bool should_overwrite_per_dir_entry(php_per_dir_entry
*orig_per_dir_entry, php_per_dir_entry *new_per_dir_entry)
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
+php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
+ php_per_dir_entry *orig_per_dir_entry;
+ php_per_dir_entry *new_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength, (void **)
+new_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
if (new_per_dir_entry-type==PHP_INI_SYSTEM
orig_per_dir_entry-type!=PHP_INI_SYSTEM) {
return 1;
@@ -711,7 +718,7 @@
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *))
should_overwrite_per_dir_entry);
+ zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
+copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
+should_overwrite_per_dir_entry, NULL);
return addv;
}
/* }}} */
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.6 php4/sapi/apache_hooks/mod_php4.c:1.7
--- php4/sapi/apache_hooks/mod_php4.c:1.6 Tue Dec 31 10:59:05 2002
+++ php4/sapi/apache_hooks/mod_php4.c Tue Feb 4 08:12:48 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: mod_php4.c,v 1.6 2002/12/31 15:59:05 sebastian Exp $ */
+/* $Id: mod_php4.c,v 1.7 2003/02/04 13:12:48 zeev Exp $ */
#include php_apache_http.h
@@ -786,8 +786,15 @@
/* {{{ should_overwrite_per_dir_entry
*/
-static zend_bool should_overwrite_per_dir_entry(php_per_dir_entry
*orig_per_dir_entry, php_per_dir_entry *new_per_dir_entry)
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
+php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
+ php_per_dir_entry *orig_per_dir_entry;
+ php_per_dir_entry *new_per_dir_entry;
+
+ if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength, (void **)
+new_per_dir_entry)==FAILURE) {
+ return 1; /* does not exist in dest, copy from source */
+ }
+
if (new_per_dir_entry-type==PHP_INI_SYSTEM
[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c
iliaa Tue Feb 4 13:34:01 2003 EDT
Modified files:
/php4/ext/pgsql pgsql.c
Log:
Made the row parameter in pg_result_seek() non-optional, the current
implementation would result in random behavior if the 2nd argument is not
passed.
Fixed bug #22042 (pg_result_seek() would never seek to the 1st row in the
result due to always seeking to row next to the one requested).
Removed dead code from pg_result_seek().
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.257 php4/ext/pgsql/pgsql.c:1.258
--- php4/ext/pgsql/pgsql.c:1.257Sat Jan 18 14:28:08 2003
+++ php4/ext/pgsql/pgsql.c Tue Feb 4 13:34:00 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.257 2003/01/18 19:28:08 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.258 2003/02/04 18:34:00 iliaa Exp $ */
#include stdlib.h
@@ -1437,23 +1437,18 @@
int row;
pgsql_result_handle *pg_result;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l,
- result, row) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl, result, row) ==
+FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(pg_result, pgsql_result_handle *, result, -1, PostgreSQL
result, le_result);
- /* Let see if we are better to have another function for this */
- /* if offset is omitted, return current position */
-/* if (ZEND_NUM_ARGS() == 1) */
-/* RETURN_LONG(pg_result-row); */
-
- if (row 0 || row = PQntuples(pg_result-result))
+ if (row 0 || row = PQntuples(pg_result-result)) {
RETURN_FALSE;
+ }
/* seek to offset */
- pg_result-row = row;
+ pg_result-row = row - 1;
RETURN_TRUE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/pgsql pgsql.c
iliaa Tue Feb 4 13:34:11 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/pgsql pgsql.c
Log:
MFH
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.244.2.6 php4/ext/pgsql/pgsql.c:1.244.2.7
--- php4/ext/pgsql/pgsql.c:1.244.2.6Sat Jan 4 07:34:27 2003
+++ php4/ext/pgsql/pgsql.c Tue Feb 4 13:34:10 2003
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.244.2.6 2003/01/04 12:34:27 derick Exp $ */
+/* $Id: pgsql.c,v 1.244.2.7 2003/02/04 18:34:10 iliaa Exp $ */
#include stdlib.h
@@ -1437,23 +1437,18 @@
int row;
pgsql_result_handle *pg_result;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l,
- result, row) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl, result, row) ==
+FAILURE) {
return;
}
ZEND_FETCH_RESOURCE(pg_result, pgsql_result_handle *, result, -1, PostgreSQL
result, le_result);
- /* Let see if we are better to have another function for this */
- /* if offset is omitted, return current position */
-/* if (ZEND_NUM_ARGS() == 1) */
-/* RETURN_LONG(pg_result-row); */
-
- if (row 0 || row = PQntuples(pg_result-result))
+ if (row 0 || row = PQntuples(pg_result-result)) {
RETURN_FALSE;
+ }
/* seek to offset */
- pg_result-row = row;
+ pg_result-row = row - 1;
RETURN_TRUE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
iliaa Tue Feb 4 13:35:56 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.59 php4/NEWS:1.1247.2.60 --- php4/NEWS:1.1247.2.59 Tue Feb 4 05:10:25 2003 +++ php4/NEWS Tue Feb 4 13:35:55 2003 @@ -12,6 +12,8 @@ - Added --clean option into phpize. (Jani) - Added --ldflags option into php-config. (Jani) - Added OCIPasswordChange() which allows renewing expired Oracle users. (Maxim) +- Fixed bug #22042 (pg_result_seek() would never seek to the 1st row in the + result due to always seeking to row next to the one requested). (Ilia) - Fixed bug #17448 (Print the message when OCI_SUCCESS_WITH_INFO is returned). (Maxim) - Fixed bug #13561 (--without-pear disabled phpize/php-config install). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cli php_cli.c
helly Tue Feb 4 15:52:13 2003 EDT Modified files: /php4/sapi/cli php_cli.c Log: remove it thenthis forces to put work in man page ... Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.64 php4/sapi/cli/php_cli.c:1.65 --- php4/sapi/cli/php_cli.c:1.64Mon Feb 3 02:41:05 2003 +++ php4/sapi/cli/php_cli.c Tue Feb 4 15:52:13 2003 @@ -300,7 +300,7 @@ %s [options] -r code [--] [args...]\n %s [options] [-B begin_code] -R code [-E end_code] [--] [args...]\n %s [options] [-B begin_code] -F file [-E end_code] [--] [args...]\n - %s [options] [--] [args...]\n + %s [options] -- [args...]\n \n -a Run interactively\n -c path|file Look for php.ini file in this directory\n @@ -325,25 +325,6 @@ args... Arguments passed to script. Use -- args when first argument\n starts with - or script is read from stdin\n \n -The PHP Command Line Interface 'CLI' supports the following operation modes:\n -\n - You can parse and execute files by using parameter -f followed by the\n - name of the file to be executed.\n -\n - Using parameter -r you can directly execute PHP code simply as you would\n - do inside a php file when using the eval() function.\n -\n - It is also possible to process the standard input line by line using either\n - the parameter -R or -F. In this mode each separate input line causes the\n - code specified by -R (see -r) or the file specified by -F to be executed.\n - You can access the input line by $argn. While processing the input lines\n - $argi contains the number of the actual line being processed. Further more\n - the paramters -B and -E can be used to execute code (see -r) before and\n - after input line processing respectively.\n -\n - If none of -r -f -B -R -F and -E is present but a single parameter is given\n - then this parameter is taken as the filename to process (same as with -f)\n - If no parameter is present then the standard input is read and executed.\n , prog, prog, prog, prog, prog); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c /sapi/apache_hooks mod_php4.c
iliaa Tue Feb 4 15:54:18 2003 EDT
Modified files:
/php4/sapi/apache mod_php4.c
/php4/sapi/apache_hooks mod_php4.c
Log:
Fixed compilation of Apache Apache Hooks SAPIs.
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.152 php4/sapi/apache/mod_php4.c:1.153
--- php4/sapi/apache/mod_php4.c:1.152 Tue Feb 4 08:12:48 2003
+++ php4/sapi/apache/mod_php4.c Tue Feb 4 15:54:17 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.152 2003/02/04 13:12:48 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.153 2003/02/04 20:54:17 iliaa Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -674,7 +674,6 @@
*/
static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
- php_per_dir_entry *orig_per_dir_entry;
php_per_dir_entry *new_per_dir_entry;
if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength, (void **)
new_per_dir_entry)==FAILURE) {
@@ -718,7 +717,7 @@
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
+copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *))
+should_overwrite_per_dir_entry);
return addv;
}
/* }}} */
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.7 php4/sapi/apache_hooks/mod_php4.c:1.8
--- php4/sapi/apache_hooks/mod_php4.c:1.7 Tue Feb 4 08:12:48 2003
+++ php4/sapi/apache_hooks/mod_php4.c Tue Feb 4 15:54:17 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: mod_php4.c,v 1.7 2003/02/04 13:12:48 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.8 2003/02/04 20:54:17 iliaa Exp $ */
#include php_apache_http.h
@@ -783,12 +783,11 @@
}
/* }}} */
-/* {{{ should_overwrite_per_dir_entry
+/* {{{ should_overwrite_per_dir_entry;
*/
static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
- php_per_dir_entry *orig_per_dir_entry;
php_per_dir_entry *new_per_dir_entry;
if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength, (void **)
new_per_dir_entry)==FAILURE) {
@@ -875,7 +874,7 @@
php_per_dir_config *a = (php_per_dir_config *) addv;
php_per_dir_config *b = (php_per_dir_config *) basev;
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) a-ini_settings, (HashTable *)
b-ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(replace_checker_func_t) should_overwrite_per_dir_entry, NULL);
+ zend_hash_merge_ex((HashTable *) a-ini_settings, (HashTable *)
+b-ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
+(zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
a-headers_handlers =
(a-headers_handlers.top)?a-headers_handlers:b-headers_handlers;
a-auth_handlers = (a-auth_handlers.top)?a-auth_handlers:b-auth_handlers;
a-access_handlers =
(a-access_handlers.top)?a-access_handlers:b-access_handlers;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/bcmath bcmath.c
helly Tue Feb 4 16:01:55 2003 EDT
Modified files:
/php4/ext/bcmathbcmath.c
Log:
fix ZTS build
Index: php4/ext/bcmath/bcmath.c
diff -u php4/ext/bcmath/bcmath.c:1.48 php4/ext/bcmath/bcmath.c:1.49
--- php4/ext/bcmath/bcmath.c:1.48 Tue Feb 4 14:03:30 2003
+++ php4/ext/bcmath/bcmath.cTue Feb 4 16:01:54 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bcmath.c,v 1.48 2003/02/04 19:03:30 pollita Exp $ */
+/* $Id: bcmath.c,v 1.49 2003/02/04 21:01:54 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -113,7 +113,7 @@
/* {{{ php_str2num
Convert to bc_num detecting scale */
-static void php_str2num(bc_num *num, char *str) {
+static void php_str2num(bc_num *num, char *str TSRMLS_DC) {
char *p;
if (!(p = strchr(str, '.'))) {
@@ -155,8 +155,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_add (first, second, result, scale);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -199,8 +199,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_sub (first, second, result, scale);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -243,8 +243,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_multiply (first, second, result, scale TSRMLS_CC);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -287,8 +287,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
switch (bc_divide (first, second, result, scale TSRMLS_CC)) {
case 0: /* OK */
result-n_scale = scale;
@@ -365,9 +365,9 @@
bc_init_num(second TSRMLS_CC);
bc_init_num(mod TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, left);
- php_str2num(second, right);
- php_str2num(mod, modulous);
+ php_str2num(first, left TSRMLS_CC);
+ php_str2num(second, right TSRMLS_CC);
+ php_str2num(mod, modulous TSRMLS_CC);
bc_raisemod(first, second, mod, result, scale TSRMLS_CC);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -411,8 +411,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_raise (first, second, result, scale TSRMLS_CC);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -452,7 +452,7 @@
}
convert_to_string_ex(left);
bc_init_num(result TSRMLS_CC);
- php_str2num(result, Z_STRVAL_PP(left));
+ php_str2num(result, Z_STRVAL_PP(left) TSRMLS_CC);
if (bc_sqrt (result, scale TSRMLS_CC) != 0) {
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/bcmath bcmath.c
andiTue Feb 4 16:07:40 2003 EDT
Modified files:
/php4/ext/bcmathbcmath.c
Log:
- Please follow coding standards (this isn't java :)
Index: php4/ext/bcmath/bcmath.c
diff -u php4/ext/bcmath/bcmath.c:1.49 php4/ext/bcmath/bcmath.c:1.50
--- php4/ext/bcmath/bcmath.c:1.49 Tue Feb 4 16:01:54 2003
+++ php4/ext/bcmath/bcmath.cTue Feb 4 16:07:40 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bcmath.c,v 1.49 2003/02/04 21:01:54 helly Exp $ */
+/* $Id: bcmath.c,v 1.50 2003/02/04 21:07:40 andi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -113,7 +113,8 @@
/* {{{ php_str2num
Convert to bc_num detecting scale */
-static void php_str2num(bc_num *num, char *str TSRMLS_DC) {
+static void php_str2num(bc_num *num, char *str TSRMLS_DC)
+{
char *p;
if (!(p = strchr(str, '.'))) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/bcmath bcmath.c
At 22:07 04.02.2003, Andi Gutmans wrote: andiTue Feb 4 16:07:40 2003 EDT Modified files: /php4/ext/bcmathbcmath.c Log: - Please follow coding standards (this isn't java :) I only corrected this... -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/bcmath bcmath.c
At 10:13 PM 2/4/2003 +0100, Marcus Börger wrote: At 22:07 04.02.2003, Andi Gutmans wrote: andiTue Feb 4 16:07:40 2003 EDT Modified files: /php4/ext/bcmathbcmath.c Log: - Please follow coding standards (this isn't java :) I only corrected this... I know. It wasn't meant for you. Anyway it's no big deal, see smiley. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /ext/bcmath bcmath.c
pollita Tue Feb 4 16:39:50 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/bcmathbcmath.c
Log:
FMH(r-1.49/r-1.50)
Index: php4/ext/bcmath/bcmath.c
diff -u php4/ext/bcmath/bcmath.c:1.39.4.4 php4/ext/bcmath/bcmath.c:1.39.4.5
--- php4/ext/bcmath/bcmath.c:1.39.4.4 Tue Feb 4 14:02:02 2003
+++ php4/ext/bcmath/bcmath.cTue Feb 4 16:39:50 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bcmath.c,v 1.39.4.4 2003/02/04 19:02:02 pollita Exp $ */
+/* $Id: bcmath.c,v 1.39.4.5 2003/02/04 21:39:50 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -112,7 +112,8 @@
/* {{{ php_str2num
Convert to bc_num detecting scale */
-static void php_str2num(bc_num *num, char *str) {
+static void php_str2num(bc_num *num, char *str TSRMLS_DC)
+{
char *p;
if (!(p = strchr(str, '.'))) {
@@ -154,8 +155,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_add (first, second, result, scale);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -198,8 +199,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_sub (first, second, result, scale);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -242,8 +243,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_multiply (first, second, result, scale TSRMLS_CC);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -286,8 +287,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
switch (bc_divide (first, second, result, scale TSRMLS_CC)) {
case 0: /* OK */
result-n_scale = scale;
@@ -377,8 +378,8 @@
bc_init_num(first TSRMLS_CC);
bc_init_num(second TSRMLS_CC);
bc_init_num(result TSRMLS_CC);
- php_str2num(first, Z_STRVAL_PP(left));
- php_str2num(second, Z_STRVAL_PP(right));
+ php_str2num(first, Z_STRVAL_PP(left) TSRMLS_CC);
+ php_str2num(second, Z_STRVAL_PP(right) TSRMLS_CC);
bc_raise (first, second, result, scale TSRMLS_CC);
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
@@ -418,7 +419,7 @@
}
convert_to_string_ex(left);
bc_init_num(result TSRMLS_CC);
- php_str2num(result, Z_STRVAL_PP(left));
+ php_str2num(result, Z_STRVAL_PP(left) TSRMLS_CC);
if (bc_sqrt (result, scale TSRMLS_CC) != 0) {
result-n_scale = scale;
Z_STRVAL_P(return_value) = bc_num2str(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cli php.1
helly Tue Feb 4 19:12:47 2003 EDT Added files: /php4/sapi/cli php.1 Log: First step - abrief version. @Added man page for CLI version of PHP. (marcus) # I was also thinking about an author section with # The PHP Group, Edin Kadribasic, Marcus Boerger, Rasmus Lerdorf, # Stig Bakken and Zeev Suraski beeing mentioned. Group of corse and # the rest is listed in php_cli.c. Index: php4/sapi/cli/php.1 +++ php4/sapi/cli/php.1 /+--+ /| PHP Version 4| /+--+ /| Copyright (c) 1997-2003 The PHP Group| /+--+ /| This source file is subject to version 2.02 of the PHP license, | /| that is bundled with this package in the file LICENSE, and is| /| available at through the world-wide-web at | /| http://www.php.net/license/2_02.txt. | /| If you did not receive a copy of the PHP license and are unable to | /| obtain it through the world-wide-web, please send a note to | /| [EMAIL PROTECTED] so we can mail you a copy immediately. | /+--+ /| Author: Marcus Boerger [EMAIL PROTECTED] | /+--+ / / $Id: php.1,v 1.1 2003/02/05 00:12:46 helly Exp $ / TH PHP 1 SH NAME B php Command Line Interface 'CLI' SH SYNOPSIS B php [options] [ B -f ] IR file [[--] IR args... ] LP B php [options] B -r IR code [[--] IR args... ] LP B php [options] [-B IR code ] B -R IR code [-E IR code ] [[--] IR args... ] LP B php [options] [-B IR code ] B -F IR file [-E IR code ] [[--] IR args... ] LP B php [options] -- [ IR args... ] LP SH DESCRIPTION You can parse and execute files by using parameter -f followed by the name of the IR file to be executed. LP Using parameter -r you can directly execute B PHP IR code simply as you would do inside a B php file when using the B eval() function. LP It is also possible to process the standard input line by line using either the parameter -R or -F. In this mode each separate input line causes the IR code specified by -R or the IR file specified by -F to be executed. You can access the input line by \fB$argn\fP. While processing the input lines B $argi contains the number of the actual line being processed. Further more the paramters -B and -E can be used to execute IR code (see -r) before and after input line processing respectively. LP If none of -r -f -B -R -F or -E is present but a single parameter is given then this is taken as the filename to process (same as with -f). If no parameter is present then the standard input is read and executed. SH OPTIONS TP 15 B -a Run interactively TP B -c path|file Look for B php.ini file in this directory TP B -n No B php.ini file will be used TP B -d foo[=bar] Define INI entry IR foo with value IR bar TP B -e Generate extended information for debugger/profiler TP B -f file Parse and execute IR file TP B -h This help TP B -i B PHP information TP B -l Syntax check only (lint) TP B -m Show compiled in modules TP B -r code Run B PHP IR code without using script tags B '?..?' TP B -B code Run B PHP IR code before processing input lines TP B -R code Run B PHP IR code for every input line TP B -F file Parse and execute IR file for every input line TP B -E code Run B PHP IR code after processing all input lines TP B -s Display colour syntax highlighted source TP B -v Version number TP B -w Display source with stripped comments and whitespace TP B -z file Load Zend extension IR file TP IR args... Arguments passed to script. Use B '--' IR args when first argument starts with B '-' or script is read from stdin SH FILES TP 15 B php-cli.ini The configuration file for the CLI version of B PHP. TP B php.ini The standard configuration file will only be used when B php-cli.ini cannot not be found. SH COPYRIGHT Copyright (c) 1997-2003 The PHP Group LP This source file is subject to version 2.02 of the B PHP license, that is bundled with this package in the file LICENSE, and is available at through the world-wide-web at BR B http://www.php.net/license/2_02.txt. If you did not receive a copy of the PHP license and are unable to obtain it through the world-wide-web, please send a note to B [EMAIL PROTECTED] so we can mail you a copy immediately. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cli php.1
helly Tue Feb 4 19:35:20 2003 EDT Modified files: /php4/sapi/cli php.1 Log: # RTFM .. and then it goes better :-) Index: php4/sapi/cli/php.1 diff -u php4/sapi/cli/php.1:1.1 php4/sapi/cli/php.1:1.2 --- php4/sapi/cli/php.1:1.1 Tue Feb 4 19:12:46 2003 +++ php4/sapi/cli/php.1 Tue Feb 4 19:35:20 2003 @@ -14,7 +14,7 @@ ./| Author: Marcus Boerger [EMAIL PROTECTED] | ./+--+ ./ -./ $Id: php.1,v 1.1 2003/02/05 00:12:46 helly Exp $ +./ $Id: php.1,v 1.2 2003/02/05 00:35:20 helly Exp $ ./ .TH PHP 1 .SH NAME @@ -27,7 +27,7 @@ ] .IR file [[--] -.IR args... +.IR args ] .LP .B php @@ -35,7 +35,7 @@ .B -r .IR code [[--] -.IR args... +.IR args ] .LP .B php @@ -47,7 +47,7 @@ [-E .IR code ] [[--] -.IR args... +.IR args ] .LP .B php @@ -59,12 +59,12 @@ [-E .IR code ] [[--] -.IR args... +.IR args ] .LP .B php [options] -- [ -.IR args... +.IR args ] .LP .SH DESCRIPTION @@ -182,7 +182,7 @@ Load Zend extension .IR file .TP -.IR args... +.IR args Arguments passed to script. Use .B '--' .IR args @@ -207,8 +207,11 @@ license, that is bundled with this package in the file LICENSE, and is available at through the world-wide-web at -.BR +.PD 0 +.P .B http://www.php.net/license/2_02.txt. +.P +.PD 1 If you did not receive a copy of the PHP license and are unable to obtain it through the world-wide-web, please send a note to .B [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache mod_php4.c /sapi/apache_hooks mod_php4.c
iliaa Tue Feb 4 19:41:40 2003 EDT
Modified files:
/php4/sapi/apache mod_php4.c
/php4/sapi/apache_hooks mod_php4.c
Log:
Build Fix.
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.153 php4/sapi/apache/mod_php4.c:1.154
--- php4/sapi/apache/mod_php4.c:1.153 Tue Feb 4 15:54:17 2003
+++ php4/sapi/apache/mod_php4.c Tue Feb 4 19:41:40 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php4.c,v 1.153 2003/02/04 20:54:17 iliaa Exp $ */
+/* $Id: mod_php4.c,v 1.154 2003/02/05 00:41:40 iliaa Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -717,7 +717,7 @@
static void *php_merge_dir(pool *p, void *basev, void *addv)
{
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
copy_per_dir_entry, sizeof(php_per_dir_entry), (zend_bool (*)(void *, void *))
should_overwrite_per_dir_entry);
+ zend_hash_merge_ex((HashTable *) addv, (HashTable *) basev, (copy_ctor_func_t)
+copy_per_dir_entry, sizeof(php_per_dir_entry), (merge_checker_func_t)
+should_overwrite_per_dir_entry, NULL);
return addv;
}
/* }}} */
Index: php4/sapi/apache_hooks/mod_php4.c
diff -u php4/sapi/apache_hooks/mod_php4.c:1.8 php4/sapi/apache_hooks/mod_php4.c:1.9
--- php4/sapi/apache_hooks/mod_php4.c:1.8 Tue Feb 4 15:54:17 2003
+++ php4/sapi/apache_hooks/mod_php4.c Tue Feb 4 19:41:40 2003
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED]
|
+--+
*/
-/* $Id: mod_php4.c,v 1.8 2003/02/04 20:54:17 iliaa Exp $ */
+/* $Id: mod_php4.c,v 1.9 2003/02/05 00:41:40 iliaa Exp $ */
#include php_apache_http.h
@@ -874,7 +874,7 @@
php_per_dir_config *a = (php_per_dir_config *) addv;
php_per_dir_config *b = (php_per_dir_config *) basev;
/* This function *must* return addv, and not modify basev */
- zend_hash_merge_ex((HashTable *) a-ini_settings, (HashTable *)
b-ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
(zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
+ zend_hash_merge_ex((HashTable *) a-ini_settings, (HashTable *)
+b-ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry),
+(merge_checker_func_t) should_overwrite_per_dir_entry, NULL);
a-headers_handlers =
(a-headers_handlers.top)?a-headers_handlers:b-headers_handlers;
a-auth_handlers = (a-auth_handlers.top)?a-auth_handlers:b-auth_handlers;
a-access_handlers =
(a-access_handlers.top)?a-access_handlers:b-access_handlers;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
