[PHP-CVS-DAILY] cvs: Zend / ChangeLog
changelog Fri Mar 7 20:31:35 2003 EDT Modified files: /Zend ChangeLog Log: ChangeLog update Index: Zend/ChangeLog diff -u Zend/ChangeLog:1.116 Zend/ChangeLog:1.117 --- Zend/ChangeLog:1.116Thu Mar 6 20:32:28 2003 +++ Zend/ChangeLog Fri Mar 7 20:31:34 2003 @@ -1,3 +1,9 @@ +2003-03-07 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_3) + zend_execute.c: + MFZE2 + 2003-03-06 Jani Taskinen [EMAIL PROTECTED] * (PHP_4_3) @@ -982,7 +988,7 @@ 2002-05-13 Sterling Hughes [EMAIL PROTECTED] -* zend_qsort.c: add $Id: ChangeLog,v 1.116 2003/03/07 01:32:28 changelog Exp $ tag +* zend_qsort.c: add $Id: ChangeLog,v 1.117 2003/03/08 01:31:34 changelog Exp $ tag 2002-05-13 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Mar 7 20:31:42 2003 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.190 ZendEngine2/ChangeLog:1.191 --- ZendEngine2/ChangeLog:1.190 Thu Mar 6 20:32:35 2003 +++ ZendEngine2/ChangeLog Fri Mar 7 20:31:41 2003 @@ -1,3 +1,26 @@ +2003-03-07 Sebastian Bergmann [EMAIL PROTECTED] + +* ZEND_CHANGES: + Dedicated to Greg Beaver [EMAIL PROTECTED]. + +* ZEND_CHANGES: + Document 'final'. + +* ZEND_CHANGES: + Fix class type hints example. + +* ZEND_CHANGES: + Update 'abstract' section. + +2003-03-07 Jani Taskinen [EMAIL PROTECTED] + +* zend_ini.c + zend_ini.h: + Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings. + +* zend_execute.c: + Better fix for the memleaks (bug 19943) by Moriyoshi + 2003-03-06 Zeev Suraski [EMAIL PROTECTED] * zend_compile.c @@ -662,7 +685,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.190 2003/03/07 01:32:35 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.191 2003/03/08 01:31:41 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Fri Mar 7 20:31:27 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1287 php4/ChangeLog:1.1288 --- php4/ChangeLog:1.1287 Thu Mar 6 20:32:22 2003 +++ php4/ChangeLog Fri Mar 7 20:31:26 2003 @@ -1,3 +1,142 @@ +2003-03-07 Jani Taskinen [EMAIL PROTECTED] + +* sapi/isapi/php4isapi.c: + Fixed bug #22473 (ISAPI Secure Server Variables not available) + +* (PHP_4_3) + NEWS: + Added note about the 64bit fixes + +* NEWS: + These will be already in 4.3.x + +2003-03-07 Uwe Schindler [EMAIL PROTECTED] + +* (PHP_4_3) + sapi/nsapi/CREDITS: + credits update + +2003-03-07 J Smith [EMAIL PROTECTED] + +* tests/classes/interfaces_001.phpt + tests/classes/interfaces_002.phpt + tests/classes/type_hinting_001.phpt + tests/lang/type_hints_001.phpt: + Added tests for interfaces and class type hinting. + +2003-03-07 Ben Mansell [EMAIL PROTECTED] + +* sapi/cgi/cgi_main.c: + Fix bug whereby a webserver closing stdout from the CGI/FastCGI binary + would cause PHP to get caught in an infinite loop of failing write() + syscalls. + +2003-03-07 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Bug fixing news. + +* ext/ldap/ldap.c: + Fixed bug #22585 (Do not terminate the script on minor errors). + +* sapi/apache2handler/php_functions.c: + OnUpdateInt - OnUpdateLong. + +* sapi/apache2handler/apache_config.c + sapi/apache2handler/php_apache.h + sapi/apache2handler/php_functions.c + sapi/apache2handler/sapi_apache2.c: + CS Fixes. + Fixed a bug with 404 handling. + Added more detailed Apache info for phpinfo(). + Added the support for last_modified. + +2003-03-07 David Hill [EMAIL PROTECTED] + +* (PHP_4_3) + ext/bz2/bz2.c + ext/dio/dio.c + ext/domxml/php_domxml.c + ext/fdf/fdf.c + ext/ftp/php_ftp.c + ext/ldap/ldap.c + ext/mcrypt/mcrypt.c + ext/mhash/mhash.c + ext/openssl/openssl.c + ext/pgsql/pgsql.c + ext/posix/posix.c + ext/sockets/sockets.c + ext/standard/exec.c + ext/standard/file.c + ext/standard/fsock.c + ext/standard/head.c + ext/standard/html.c + ext/standard/metaphone.c + ext/standard/string.c + ext/sysvsem/sysvsem.c + ext/zip/zip.c + ext/zlib/zlib.c + main/output.c: + 64-bit correction to variables passed to zend_parse_parameters + +2003-03-07 Jani Taskinen [EMAIL PROTECTED] + +* configure.in: + Create php_version.h in the correct directory + +* ext/fam/fam.c + ext/fbsql/php_fbsql.c + ext/hwapi/hwapi.cpp + ext/hyperwave/hw.c + ext/informix/ifx.ec + ext/ingres_ii/ii.c + ext/interbase/interbase.c + ext/ircg/ircg.c + ext/ldap/ldap.c + ext/mbstring/mbstring.c + ext/mssql/php_mssql.c + ext/mysql/php_mysql.c + ext/mysqli/mysqli.c + ext/ncurses/ncurses.c + ext/odbc/php_odbc.c + ext/pfpro/pfpro.c + ext/pgsql/pgsql.c + ext/session/session.c + ext/skeleton/skeleton.c + ext/standard/assert.c + ext/standard/file.c + ext/sybase_ct/php_sybase_ct.c + ext/sysvmsg/sysvmsg.c + ext/tokenizer/tokenizer.c + ext/yaz/php_yaz.c + ext/zlib/zlib.c + main/main.c + netware/phplib.imp + sapi/apache/php_apache.c + sapi/apache_hooks/php_apache.c + scripts/ext_skel_ng/extension_parser.php: + Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings. + +* ext/odbc/config.m4: + Fixed typo caught by Dave. + +* ext/sysvmsg/php_sysvmsg.h + ext/sysvmsg/sysvmsg.c + ext/sysvsem/sysvsem.c + ext/sysvshm/php_sysvshm.h + ext/sysvshm/sysvshm.c: + WS CS fixes + +2003-03-07 Marcus Boerger [EMAIL PROTECTED] + +* tests/classes/abstract.phpt + tests/classes/abstract_class.phpt + tests/classes/abstract_inherit.phpt + tests/classes/abstract_not_declared.phpt + tests/classes/abstract_static.phpt: + abstract classes must now be declared abstract + 2003-03-06 David Hill [EMAIL PROTECTED] * ext/bz2/bz2.c @@ -1220,7 +1359,7 @@ * sapi/apache/libpre.c sapi/apache/php_apache_http.h: - Added missing headers and $Id: ChangeLog,v 1.1287 2003/03/07 01:32:22 changelog Exp $ tags. + Added missing headers and $Id: ChangeLog,v 1.1288 2003/03/08 01:31:26 changelog Exp $ tags. * sapi/cgi/config9.m4: MFB: Fixed bug #22356 (Do not add empty -I flags). @@ -1779,7 +1918,7 @@ main/streams/plain_wrapper.c main/streams/streams.c main/streams/userspace.c: - ws fixes + missing $Id: ChangeLog,v 1.1287 2003/03/07 01:32:22 changelog Exp $ tags, headers added + ws fixes + missing $Id: ChangeLog,v 1.1288 2003/03/08 01:31:26 changelog Exp $ tags, headers
[PHP-CVS-DAILY] cvs: php4 / NEWS
changelog Fri Mar 7 20:31:51 2003 EDT Modified files: /php4 NEWS Log: NEWS update Index: php4/NEWS diff -u php4/NEWS:1.1368 php4/NEWS:1.1369 --- php4/NEWS:1.1368Fri Mar 7 13:38:04 2003 +++ php4/NEWS Fri Mar 7 20:31:50 2003 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 +- 64-bit correction to variables passed to zend_parse_parameters (Dave) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21600 (Assign by reference function call changes variable contents).
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Work for both PHP 4 and PHP 5? You kinda like test the API number..this is not the only difference between them.. --Jani On Fri, 7 Mar 2003, Derick Rethans wrote: On Fri, 7 Mar 2003, Jani Taskinen wrote: Log: Renamed OnUpdateInt - OnUpdateLong to prevent further misunderstandings. # Intentionally left out any 'alias' for it, this way 3rd party extension # maintainers will really NOTICE the change. How can we test in 3rd party extensions for this whether to use the first (OnUpdateInt) or the second (OnUpdateLong)? THis is quite important for external extensions which need to work for both flavors. Derick -- - For Sale! - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Jani Taskinen wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Sascha Schumann wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? hehe, I mean Never Mind with nm :) Please bump the API number. I still agree with that though. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? Please bump the API number. - Sascha -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
On Fri, 7 Mar 2003, Sascha Schumann wrote: Work for both PHP 4 and PHP 5? Ok, I thought it was merged to the branch, but it wasn't it seems... nm then. nm.. which file? httpd? apache? libphp4.so? Or .sl? Or .a? Please bump the API number. Which one(s) ? We have 3 of them.. And two of those are still same in php5 and php4 (PHP_4_3 branch). --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /ext/fam fam.c /ext/fbsql php_fbsql.c /ext/hwapi hwapi.cpp /ext/hyperwave hw.c /ext/informix ifx.ec /ext/ingres_iiii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext
Which one(s) ? We have 3 of them.. A Zend API change should be reflected by the a bump in the Zend API version number, ZEND_EXTENSION_API_NO. - Sascha -- 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/bz2 bz2.c /ext/dio dio.c /ext/domxml php_domxml.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/ldap ldap.c /ext/mcrypt mcrypt.c /ext/mhash mhash.c /ext/openssl openssl.c /ext/pgsql pgsql.c /ext/posix posix.c /ext/sockets sockets.c /ext/standard exec.c file.c fsock.c head.c html.c metaphone.c string.c /ext/sysvsem sysvsem.c /ext/zip zip.c /ext/zlib zlib.c /main output.c
ddhill Fri Mar 7 08:42:24 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/bz2 bz2.c
/php4/ext/dio dio.c
/php4/ext/domxmlphp_domxml.c
/php4/ext/fdf fdf.c
/php4/ext/ftp php_ftp.c
/php4/ext/ldap ldap.c
/php4/ext/mcryptmcrypt.c
/php4/ext/mhash mhash.c
/php4/ext/openssl openssl.c
/php4/ext/pgsql pgsql.c
/php4/ext/posix posix.c
/php4/ext/sockets sockets.c
/php4/ext/standard exec.c file.c fsock.c head.c html.c metaphone.c
string.c
/php4/ext/sysvsem sysvsem.c
/php4/ext/zip zip.c
/php4/ext/zlib zlib.c
/php4/main output.c
Log:
64-bit correction to variables passed to zend_parse_parameters
@64-bit correction to variables passed to zend_parse_parameters (Dave)
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.61.2.1 php4/ext/bz2/bz2.c:1.61.2.2
--- php4/ext/bz2/bz2.c:1.61.2.1 Tue Dec 31 11:34:11 2002
+++ php4/ext/bz2/bz2.c Fri Mar 7 08:42:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.61.2.1 2002/12/31 16:34:11 sebastian Exp $ */
+/* $Id: bz2.c,v 1.61.2.2 2003/03/07 13:42:11 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -253,7 +253,7 @@
PHP_FUNCTION(bzread)
{
zval *bz;
- int len = 1024;
+ long len = 1024;
php_stream *stream;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, bz,
len)) {
Index: php4/ext/dio/dio.c
diff -u php4/ext/dio/dio.c:1.21.2.2 php4/ext/dio/dio.c:1.21.2.3
--- php4/ext/dio/dio.c:1.21.2.2 Tue Dec 31 11:34:25 2002
+++ php4/ext/dio/dio.c Fri Mar 7 08:42:11 2003
@@ -146,8 +146,8 @@
php_fd_t *f;
char *file_name;
int file_name_length;
- int flags;
- mode_tmode = 0;
+ long flags;
+ long mode = 0;
int fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sl|l, file_name,
file_name_length, flags, mode) == FAILURE) {
@@ -178,7 +178,7 @@
zval *r_fd;
php_fd_t *f;
char *data;
- int bytes = 1024;
+ long bytes = 1024;
ssize_t res;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r|l, r_fd, bytes) ==
FAILURE) {
@@ -207,8 +207,8 @@
zval *r_fd;
php_fd_t *f;
char *data;
- size_tdata_len;
- size_ttrunc_len = 0;
+ int data_len;
+ long trunc_len = 0;
ssize_t res;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs|l, r_fd, data,
data_len, trunc_len) == FAILURE) {
@@ -232,7 +232,7 @@
{
zval *r_fd;
php_fd_t *f;
- off_t offset;
+ long offset;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl, r_fd, offset) ==
FAILURE) {
return;
@@ -293,8 +293,8 @@
{
zval *r_fd;
php_fd_t *f;
- off_t offset;
- int whence = SEEK_SET;
+ long offset;
+ long whence = SEEK_SET;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl|l, r_fd, offset,
whence) == FAILURE) {
return;
@@ -312,7 +312,7 @@
zval *r_fd;
zval *arg = NULL;
php_fd_t *f;
- int cmd;
+ long cmd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rl|z, r_fd, cmd,
arg) == FAILURE) {
return;
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.218.2.10 php4/ext/domxml/php_domxml.c:1.218.2.11
--- php4/ext/domxml/php_domxml.c:1.218.2.10 Thu Mar 6 15:58:14 2003
+++ php4/ext/domxml/php_domxml.cFri Mar 7 08:42:11 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_domxml.c,v 1.218.2.10 2003/03/06 20:58:14 sesser Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.11 2003/03/07 13:42:11 ddhill Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1967,7 +1967,8 @@
zval *rv = NULL;
zval *id;
xmlNode *n, *node;
- int ret, recursive = 0;;
+ int ret;
+ long recursive = 0;
DOMXML_GET_THIS_OBJ(n, id, le_domxmlnodep);
@@ -3558,7 +3559,8 @@
zval *arg1, *id, *rv = NULL;
xmlNodePtr node, srcnode;
xmlDocPtr docp;
- int ret, recursive = 0;
+ int ret;
+ long recursive = 0;
DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
@@ -3764,7 +3766,8 @@
int ret;
char *buffer;
int buffer_len;
- int mode = 0, prevSubstValue;
+ long mode = 0;
+ int prevSubstValue;
int oldvalue = xmlDoValidityCheckingDefaultValue;
int oldvalue_keepblanks;
int prevLoadExtDtdValue = xmlLoadExtDtdDefaultValue;
@@ -3850,7 +3853,8 @@
xmlDoc *docp = NULL;
Re: [PHP-CVS] cvs: php4 /ext/bz2 bz2.c /ext/dio dio.c /ext/domxml php_domxml.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/iconv iconv.c /ext/ldap ldap.c /ext/mcrypt mcrypt.c /ext/mhash mhash.c /ext/o
Don't forget to MFH to the PHP_4_3 branch (of php4 module). Thanks for the reminder - its done. dave -- 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) /ext/bz2 bz2.c /ext/dio dio.c /ext/domxml php_domxml.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/ldapldap.c /ext/mcrypt mcrypt.c /ext/mhash mhash.c /ext/openssl open
On Fri, 7 Mar 2003, David Hill wrote: Log: 64-bit correction to variables passed to zend_parse_parameters @64-bit correction to variables passed to zend_parse_parameters (Dave) Please don't use the @ sign when you merge to the branch, as the news would go to the NEWS file in HEAD. Derick -- Stop mad cowboy disease! - Derick Rethans http://derickrethans.nl/ PHP Magazine - PHP Magazine for Professionals http://php-mag.net/ - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2handler apache_config.c php_apache.h php_functions.c sapi_apache2.c
iliaa Fri Mar 7 08:45:34 2003 EDT
Modified files:
/php4/sapi/apache2handler apache_config.c php_apache.h
php_functions.c sapi_apache2.c
Log:
CS Fixes.
Fixed a bug with 404 handling.
Added more detailed Apache info for phpinfo().
Added the support for last_modified.
Index: php4/sapi/apache2handler/apache_config.c
diff -u php4/sapi/apache2handler/apache_config.c:1.1
php4/sapi/apache2handler/apache_config.c:1.2
--- php4/sapi/apache2handler/apache_config.c:1.1Tue Feb 11 12:40:11 2003
+++ php4/sapi/apache2handler/apache_config.cFri Mar 7 08:45:33 2003
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.1 2003/02/11 17:40:11 ianh Exp $ */
+/* $Id: apache_config.c,v 1.2 2003/03/07 13:45:33 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -51,14 +51,12 @@
char status;
} php_dir_entry;
-static const char *real_value_hnd(cmd_parms *cmd, void *dummy,
- const char *name, const char *value, int status)
+static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char *name,
const char *value, int status)
{
php_conf_rec *d = dummy;
php_dir_entry e;
- phpapdebug((stderr, Getting %s=%s for %p (%d)\n, name, value, dummy,
- zend_hash_num_elements(d-config)));
+ phpapdebug((stderr, Getting %s=%s for %p (%d)\n, name, value, dummy,
zend_hash_num_elements(d-config)));
if (!strncasecmp(value, none, sizeof(none))) {
value = ;
@@ -68,25 +66,21 @@
e.value_len = strlen(value);
e.status = status;
- zend_hash_update(d-config, (char *) name, strlen(name) + 1, e,
- sizeof(e), NULL);
+ zend_hash_update(d-config, (char *) name, strlen(name) + 1, e, sizeof(e),
NULL);
return NULL;
}
-static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, const char
*name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_value_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1,
- const char *arg2, int status)
+static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1, const
char *arg2, int status)
{
char bool_val[2];
@@ -100,24 +94,20 @@
return real_value_hnd(cmd, dummy, arg1, bool_val, status);
}
-static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, const char
*name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
}
-static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,
- const char *name, const char *value)
+static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy, const
char *name, const char *value)
{
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
}
-static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig,
- const char *arg)
+static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const char
*arg)
{
if (apache2_php_ini_path_override) {
- return Only first PHPINIDir directive honored per configuration tree
- - subsequent ones ignored;
+ return Only first PHPINIDir directive honored per configuration tree
- subsequent ones ignored;
}
apache2_php_ini_path_override = ap_server_root_relative(cmd-pool, arg);
return NULL;
@@ -144,8 +134,7 @@
if (pe-status = data-status) continue;
}
zend_hash_update(e-config, str, str_len, data, sizeof(*data), NULL);
- phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, str,
- data-status, pe?pe-status:-1));
+ phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, str,
data-status, pe?pe-status:-1));
}
return new_conf;
}
@@ -175,8 +164,7 @@
zend_hash_move_forward(d-config)) {
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str, data-value));
- if (zend_alter_ini_entry(str, str_len,
[PHP-CVS] cvs: php4 /sapi/apache2handler php_functions.c
iliaa Fri Mar 7 08:52:06 2003 EDT Modified files: /php4/sapi/apache2handler php_functions.c Log: OnUpdateInt - OnUpdateLong. Index: php4/sapi/apache2handler/php_functions.c diff -u php4/sapi/apache2handler/php_functions.c:1.3 php4/sapi/apache2handler/php_functions.c:1.4 --- php4/sapi/apache2handler/php_functions.c:1.3Fri Mar 7 08:45:33 2003 +++ php4/sapi/apache2handler/php_functions.cFri Mar 7 08:52:06 2003 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_functions.c,v 1.3 2003/03/07 13:45:33 iliaa Exp $ */ +/* $Id: php_functions.c,v 1.4 2003/03/07 13:52:06 iliaa Exp $ */ #include php.h #include ext/standard/php_smart_str.h @@ -469,9 +469,9 @@ }; PHP_INI_BEGIN() - STD_PHP_INI_ENTRY(xbithack, 0,PHP_INI_ALL,OnUpdateInt, xbithack, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY(engine, 1,PHP_INI_ALL,OnUpdateInt, engine, php_apache2_info_struct, php_apache2_info) - STD_PHP_INI_ENTRY(last_modified, 0,PHP_INI_ALL,OnUpdateInt, last_modified, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(xbithack, 0,PHP_INI_ALL,OnUpdateLong, xbithack, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(engine, 1,PHP_INI_ALL,OnUpdateLong, engine, php_apache2_info_struct, php_apache2_info) + STD_PHP_INI_ENTRY(last_modified, 0,PHP_INI_ALL,OnUpdateLong, last_modified, php_apache2_info_struct, php_apache2_info) PHP_INI_END() static PHP_MINIT_FUNCTION(apache) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/ldap ldap.c
iliaa Fri Mar 7 09:03:54 2003 EDT
Modified files:
/php4/ext/ldap ldap.c
Log:
Fixed bug #22585 (Do not terminate the script on minor errors).
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.136 php4/ext/ldap/ldap.c:1.137
--- php4/ext/ldap/ldap.c:1.136 Fri Mar 7 00:15:13 2003
+++ php4/ext/ldap/ldap.cFri Mar 7 09:03:53 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.136 2003/03/07 05:15:13 sniper Exp $ */
+/* $Id: ldap.c,v 1.137 2003/03/07 14:03:53 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled );
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.136 2003/03/07
05:15:13 sniper Exp $ );
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.137 2003/03/07
14:03:53 iliaa Exp $ );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1292,7 +1292,7 @@
if (zend_hash_get_current_key(Z_ARRVAL_PP(entry), attribute, index,
0) == HASH_KEY_IS_STRING) {
ldap_mods[i]-mod_type = estrdup(attribute);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Unknown attribute
in the data);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown attribute
in the data);
/* Free allocated memory */
while (i = 0) {
efree(ldap_mods[i--]);
@@ -2098,7 +2098,7 @@
RETVAL_STRINGL(ldap_buf, ldap_len, 1);
free(ldap_buf);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Conversion from iso-8859-1
to t61 failed: %s, ldap_err2string(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Conversion from
iso-8859-1 to t61 failed: %s, ldap_err2string(result));
RETVAL_FALSE;
}
--
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/ldap ldap.c
iliaa Fri Mar 7 09:08:07 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ldap ldap.c
Log:
MFH
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.130.2.2 php4/ext/ldap/ldap.c:1.130.2.3
--- php4/ext/ldap/ldap.c:1.130.2.2 Fri Mar 7 08:42:14 2003
+++ php4/ext/ldap/ldap.cFri Mar 7 09:08:06 2003
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.130.2.2 2003/03/07 13:42:14 ddhill Exp $ */
+/* $Id: ldap.c,v 1.130.2.3 2003/03/07 14:08:06 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled );
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.130.2.2 2003/03/07
13:42:14 ddhill Exp $ );
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.130.2.3 2003/03/07
14:08:06 iliaa Exp $ );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1303,7 +1303,7 @@
if (zend_hash_get_current_key(Z_ARRVAL_PP(entry), attribute, index,
0) == HASH_KEY_IS_STRING) {
ldap_mods[i]-mod_type = estrdup(attribute);
} else {
- php_error(E_ERROR, %s(): Unknown attribute in the data,
get_active_function_name(TSRMLS_C));
+ php_error(E_WARNING, %s(): Unknown attribute in the data,
get_active_function_name(TSRMLS_C));
/* Free allocated memory */
while (i = 0) {
efree(ldap_mods[i--]);
@@ -2119,7 +2119,7 @@
RETVAL_STRINGL(ldap_buf, ldap_len, 1);
free(ldap_buf);
} else {
- php_error(E_ERROR, %s(): Conversion from iso-8859-1 to t61 failed:
%s, get_active_function_name(TSRMLS_C), ldap_err2string(result));
+ php_error(E_WARNING, %s(): Conversion from iso-8859-1 to t61 failed:
%s, get_active_function_name(TSRMLS_C), ldap_err2string(result));
RETVAL_FALSE;
}
--
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 Fri Mar 7 09:08:55 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Bug fixing news. Index: php4/NEWS diff -u php4/NEWS:1.1247.2.125 php4/NEWS:1.1247.2.126 --- php4/NEWS:1.1247.2.125 Wed Mar 5 13:48:04 2003 +++ php4/NEWS Fri Mar 7 09:08:54 2003 @@ -25,6 +25,7 @@ - Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) - Added XBM and WBMP support for getimagesize(). (Marcus) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) +- Fixed bug #22585 (Do not terminate the script on minor errors). (Ilia) - Fixed bug #22550 (overflow protection for upload_max_filesize ini option). (Ilia) - Fixed bug #22544 (writing transparency to truecolor png images). (Ilia) - Fixed bug #22520 (mcrypt_generic_deinit() was not available on Windows). (Edin) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/cgi cgi_main.c
joostersFri Mar 7 09:48:28 2003 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
Fix bug whereby a webserver closing stdout from the CGI/FastCGI binary
would cause PHP to get caught in an infinite loop of failing write()
syscalls.
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.214 php4/sapi/cgi/cgi_main.c:1.215
--- php4/sapi/cgi/cgi_main.c:1.214 Mon Feb 17 08:29:59 2003
+++ php4/sapi/cgi/cgi_main.cFri Mar 7 09:48:28 2003
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.214 2003/02/17 13:29:59 zeev Exp $ */
+/* $Id: cgi_main.c,v 1.215 2003/03/07 14:48:28 joosters Exp $ */
#include php.h
#include php_globals.h
@@ -254,6 +254,7 @@
ret = sapi_cgibin_single_write(ptr, remaining TSRMLS_CC);
if (!ret) {
php_handle_aborted_connection();
+ return str_length - remaining;
}
ptr += ret;
remaining -= ret;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes interfaces_001.phpt interfaces_002.phpt type_hinting_001.phpt /tests/lang type_hints_001.phpt
jay Fri Mar 7 10:56:31 2003 EDT
Added files:
/php4/tests/langtype_hints_001.phpt
/php4/tests/classes interfaces_001.phpt interfaces_002.phpt
type_hinting_001.phpt
Log:
Added tests for interfaces and class type hinting.
Index: php4/tests/lang/type_hints_001.phpt
+++ php4/tests/lang/type_hints_001.phpt
--TEST--
ZE2 type hinting
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class Foo {
}
class Bar {
}
function type_hint_foo(Foo $a) {
}
$foo = new Foo;
$bar = new Bar;
type_hint_foo($foo);
type_hint_foo($bar);
?
--EXPECTF--
Fatal error: Argument 1 must be an instance of foo in %s on line %d
Index: php4/tests/classes/interfaces_001.phpt
+++ php4/tests/classes/interfaces_001.phpt
--TEST--
ZE2 interfaces
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
interface Throwable {
public function getMessage();
}
class Exception implements Throwable {
public $foo = foo;
public function getMessage() {
return $this-foo;
}
}
$foo = new Exception;
echo $foo-getMessage() . \n;
?
--EXPECT--
foo
Index: php4/tests/classes/interfaces_002.phpt
+++ php4/tests/classes/interfaces_002.phpt
--TEST--
ZE2 interface with an unimplemented method
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
interface Throwable {
public function getMessage();
public function getErrno();
}
class Exception implements Throwable {
public $foo = foo;
public function getMessage() {
return $this-foo;
}
}
// this should die -- Exception class must be abstract...
$foo = new Exception;
echo $foo-getMessage() . \n;
?
--EXPECTF--
Fatal error: Class exception contains abstract methods and must be declared abstract
in %s on line %d
Index: php4/tests/classes/type_hinting_001.phpt
+++ php4/tests/classes/type_hinting_001.phpt
--TEST--
ZE2 class type hinting
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
interface Foo {
function a(Foo $foo);
}
interface Bar {
function b(Bar $bar);
}
class FooBar implements Foo, Bar {
function a(Foo $foo) {
// ...
}
function b(Bar $bar) {
// ...
}
}
class Blort {
}
$a = new FooBar;
$b = new Blort;
$a-a($b);
$a-b($b);
?
--EXPECTF--
Fatal error: Argument 1 must implement interface foo in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4(PHP_4_3) /sapi/nsapi CREDITS
thetaphiFri Mar 7 12:08:06 2003 EDT Modified files: (Branch: PHP_4_3) /php4/sapi/nsapiCREDITS Log: credits update Index: php4/sapi/nsapi/CREDITS diff -u php4/sapi/nsapi/CREDITS:1.1 php4/sapi/nsapi/CREDITS:1.1.16.1 --- php4/sapi/nsapi/CREDITS:1.1 Mon Nov 20 05:31:09 2000 +++ php4/sapi/nsapi/CREDITS Fri Mar 7 12:08:06 2003 @@ -1,2 +1,2 @@ NSAPI -Jayakumar Muthukumarasamy +Jayakumar Muthukumarasamy, Uwe Schindler -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Fri Mar 7 13:38:05 2003 EDT Modified files: /php4 NEWS Log: These will be already in 4.3.x Index: php4/NEWS diff -u php4/NEWS:1.1367 php4/NEWS:1.1368 --- php4/NEWS:1.1367Thu Mar 6 20:32:47 2003 +++ php4/NEWS Fri Mar 7 13:38:04 2003 @@ -1,7 +1,6 @@ PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- 64-bit correction to variables passed to zend_parse_parameters (Dave) - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21600 (Assign by reference function call changes variable contents). -- 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 Fri Mar 7 13:41:42 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Added note about the 64bit fixes Index: php4/NEWS diff -u php4/NEWS:1.1247.2.126 php4/NEWS:1.1247.2.127 --- php4/NEWS:1.1247.2.126 Fri Mar 7 09:08:54 2003 +++ php4/NEWS Fri Mar 7 13:41:42 2003 @@ -24,6 +24,7 @@ --enable-memory-limit. (Andrey) - Added improved JPEG 2000 support for getimagesize(). (Marcus, Adam Wright) - Added XBM and WBMP support for getimagesize(). (Marcus) +- Fixed several 64-bit problems. (Dave) - Fixed several errors in hwapi extension. Objects weren't handled properly. (Uwe) - Fixed bug #22585 (Do not terminate the script on minor errors). (Ilia) - Fixed bug #22550 (overflow protection for upload_max_filesize ini option). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/isapi php4isapi.c
sniper Fri Mar 7 13:56:15 2003 EDT
Modified files:
/php4/sapi/isapiphp4isapi.c
Log:
Fixed bug #22473 (ISAPI Secure Server Variables not available)
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.98 php4/sapi/isapi/php4isapi.c:1.99
--- php4/sapi/isapi/php4isapi.c:1.98Mon Feb 17 08:29:59 2003
+++ php4/sapi/isapi/php4isapi.c Fri Mar 7 13:56:15 2003
@@ -597,7 +597,9 @@
sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB,
track_vars_array, NULL TSRMLS_CC);
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]
-atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) {
+(atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])
+ || !strcasecmp(isapi_special_server_variables[SPECIAL_VAR_HTTPS],
on))
+ ) {
/* Register SSL ISAPI variables */
sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB,
track_vars_array, NULL TSRMLS_CC);
}
--
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 /sapi/isapi php4isapi.c
sniper Fri Mar 7 13:58:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4 NEWS
/php4/sapi/isapiphp4isapi.c
Log:
MFH: Fix for bug #22473
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.127 php4/NEWS:1.1247.2.128
--- php4/NEWS:1.1247.2.127 Fri Mar 7 13:41:42 2003
+++ php4/NEWS Fri Mar 7 13:58:34 2003
@@ -31,6 +31,7 @@
- Fixed bug #22544 (writing transparency to truecolor png images). (Ilia)
- Fixed bug #22520 (mcrypt_generic_deinit() was not available on Windows). (Edin)
- Fixed bug #22508 (Added protection against circular HTML redirects). (Ilia)
+- Fixed bug #22473 (ISAPI Secure Server variables not available). (Christian Swoboda)
- Fixed bug #22402 (opening of ftp for read/write could fail due to invalid
return code handling). (Ilia)
- Fixed bug #22384 (FNM_CASEFOLD is not available). (Hartmut)
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.92.2.1 php4/sapi/isapi/php4isapi.c:1.92.2.2
--- php4/sapi/isapi/php4isapi.c:1.92.2.1Tue Dec 31 11:27:12 2002
+++ php4/sapi/isapi/php4isapi.c Fri Mar 7 13:58:34 2003
@@ -517,7 +517,9 @@
sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB,
track_vars_array, NULL TSRMLS_CC);
if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]
-atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) {
+(atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])
+ || !strcasecmp(isapi_special_server_variables[SPECIAL_VAR_HTTPS],
on))
+ ) {
/* Register SSL ISAPI variables */
sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB,
track_vars_array, NULL TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php4 /tests/classes interfaces_001.phpt interfaces_002.phpt type_hinting_001.phpt /tests/lang type_hints_001.phpt
At 16:56 07.03.2003, J Smith wrote: jay Fri Mar 7 10:56:31 2003 EDT Added files: /php4/tests/langtype_hints_001.phpt /php4/tests/classes interfaces_001.phpt interfaces_002.phpt type_hinting_001.phpt Log: Added tests for interfaces and class type hinting. Couldn't you wait? I have a complete set of tests for interfaces already but it makes no sense to commit them as long as there are so many memleaks marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
