[PHP-CVS-DAILY] cvs: php4 / ChangeLog
changelog Sat Feb 22 20:31:46 2003 EDT Modified files: /php4 ChangeLog Log: ChangeLog update Index: php4/ChangeLog diff -u php4/ChangeLog:1.1274 php4/ChangeLog:1.1275 --- php4/ChangeLog:1.1274 Fri Feb 21 20:31:43 2003 +++ php4/ChangeLog Sat Feb 22 20:31:45 2003 -1,3 +1,103 +2003-02-22 Marcus Boerger [EMAIL PROTECTED] + +* ext/dba/libinifile/inifile.c: + Dropped optimization + +2003-02-22 Wez Furlong [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Correct a bug number - thanks to Philip... + +2003-02-22 Marcus Boerger [EMAIL PROTECTED] + +* ext/dba/libinifile/inifile.c: + INI files are case insensitive + +2003-02-22 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/file.c + ext/standard/file.h: + Revent previous patch, adding of file_write_content() was premature. + +* ext/standard/basic_functions.c + ext/standard/file.c + ext/standard/file.h + ext/standard/html.c: + int/long change. + +2003-02-22 Marcus Boerger [EMAIL PROTECTED] + +* ext/dba/libinifile/inifile.c: + Remove testcode + +* ext/dba/config.m4 + ext/dba/dba.c + ext/dba/dba_inifile.c + ext/dba/php_inifile.h + ext/dba/libinifile/.cvsignore + ext/dba/libinifile/inifile.c + ext/dba/libinifile/inifile.h + ext/dba/tests/dba_inifile.phpt: + + +2003-02-22 Andrey Hristov [EMAIL PROTECTED] + +* ext/standard/array.c: + additional speedup for array_shift(). No need to rehash if the removed + element's + key is not scalar and elements with scalar keys are already well numbered + (sequentially from 0) for some reason. This is the case if the leading + elements have no scalar indexes. + +2003-02-22 Wez Furlong [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + Squashed those ugly bugs! + +2003-02-22 Andrey Hristov [EMAIL PROTECTED] + +* ext/standard/array.c: + rehash only in case something is changed. + +2003-02-22 Georg Richter [EMAIL PROTECTED] + +* ext/mysqli/mysqli_api.c: + removed some comments + +* ext/mysqli/mysqli.c + ext/mysqli/mysqli_api.c + ext/mysqli/php_mysqli.h: + Fixed bug with stmt_close (libmysql bk version 1.1477 required) + Fixed bug with mysql_execute and float values + +2003-02-22 Justin Erenkrantz [EMAIL PROTECTED] + +* sapi/apache2handler/sapi_apache2.c: + Add xbithack support to apache2handler SAPI. + + (configuration doesn't work, but that's not something new apparently.) + +2003-02-22 Wez Furlong [EMAIL PROTECTED] + +* (PHP_4_3) + ext/standard/file.c + ext/standard/tests/file/bug21131.phpt + ext/standard/tests/file/bug22362.phpt + ext/standard/tests/file/bug22362.phpt + main/php_streams.h + main/streams.c: + Miscellaneous streams fixes, including probable fixes for: + Bug #21131 (fopen with 'a+' and rewind() doesn't work) + Bug #21713 (include remote files leaks temporary files + descriptors on + Solaris) + Bug #21185 (move_uploaded_file() does not ignore open_basedir as it + should) + Bug #22362 (combinations of fwrite(), fread() and fseek() produce + unexpected results) + 2003-02-21 Wez Furlong [EMAIL PROTECTED] * main/network.c -412,7 +512,7 main/streams/plain_wrapper.c main/streams/streams.c main/streams/userspace.c: - ws fixes + missing $Id: ChangeLog,v 1.1274 2003/02/22 01:31:43 changelog Exp $ tags, headers added + ws fixes + missing $Id: ChangeLog,v 1.1275 2003/02/23 01:31:45 changelog Exp $ tags, headers added 2003-02-19 Corne' Cornelius [EMAIL PROTECTED] -1330,7 +1430,7 * (PHP_4_3) sapi/cgi/cgi_main.c: - Added missing $Id: ChangeLog,v 1.1274 2003/02/22 01:31:43 changelog Exp $ tag + Added missing $Id: ChangeLog,v 1.1275 2003/02/23 01:31:45 changelog Exp $ tag 2003-02-14 Thies C. Arntzen [EMAIL PROTECTED]
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
wez Sat Feb 22 06:30:09 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Squashed those ugly bugs! Index: php4/NEWS diff -u php4/NEWS:1.1247.2.103 php4/NEWS:1.1247.2.104 --- php4/NEWS:1.1247.2.103 Thu Feb 20 12:57:54 2003 +++ php4/NEWS Sat Feb 22 06:30:06 2003 -21,6 +21,8 - 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 #22363 (combinations of fwrite(), fread() and fseek() produce + unexpected results). (Wez) - Fixed bug #22330 (overloaded strrpos() gives wrong results). ([EMAIL PROTECTED], Moriyoshi) - Fixed bug #22308 (optimized passthru, code is now ~40 times faster). (Ilia) -59,9 +61,11 (Wez) - Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez) - Fixed bug #21725 (return behaviour differs between include and require). (Zeev) +- Fixed bug #21713 (include remote files leaks descriptors on Solaris). (Wez) - Fixed bug #21708 (ucfirst() trouble again). (Moriyoshi) - Fixed bug #21689 (fgetcsv() suppresses some characters before a separator). (Masahiro, Moriyoshi) +- Fixed bug #21912, #21676 (GetImageSize() failed for remote files). (Wez) - Fixed bug #21597 (made glob() understand Windows paths). (Edin) - Fixed bug #21549 (problem with Ingres II persistent connections). (Jani) - Fixed bug #21544 (Extended checks for where FreeTDS is installed). (Frank) -94,7 +98,9 - Fixed bug #21228 (broken check for ob_gzhandler and made ob_start() return the correct value). (Ilia) - Fixed bug #21226 (parse_url handling of urls without a path). (Ilia) +- Fixed bug #21185 (move_uploaded_file() does not ignore open_basedir). (Wez) - Fixed bug #21169 (Compile Failure and lots of warnings on UnixWare). (Derick) +- Fixed bug #21131 (fopen() with mode 'a+' and rewind() doesn't work). (Wez) - Fixed bug #20857 (snmpset() failed always, patch by: [EMAIL PROTECTED]). (Jani) - Fixed bug #20802 (PHP would die silently when memory limit reached). (Ilia) - Fixed bug #20503 (imagesetbrush() 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 /ext/dba/libinifile inifile.c
helly Sat Feb 22 12:37:28 2003 EDT
Modified files:
/php4/ext/dba/libinifileinifile.c
Log:
Remove testcode
Index: php4/ext/dba/libinifile/inifile.c
diff -u php4/ext/dba/libinifile/inifile.c:1.1 php4/ext/dba/libinifile/inifile.c:1.2
--- php4/ext/dba/libinifile/inifile.c:1.1 Sat Feb 22 12:20:05 2003
+++ php4/ext/dba/libinifile/inifile.c Sat Feb 22 12:37:27 2003
-16,7 +16,7
+--+
*/
-/* $Id: inifile.c,v 1.1 2003/02/22 17:20:05 helly Exp $ */
+/* $Id: inifile.c,v 1.2 2003/02/22 17:37:27 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-44,7 +44,7
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.1 $;
+ return 1.0, $Revision: 1.2 $;
}
/* }}} */
-192,7 +192,6
efree(fline);
return 1;
} else {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
The following group was started with '[' but not ended with ']': '%s', fline+1);
efree(fline);
continue;
}
-377,7 +376,6
res = 1;
while(inifile_read(dba, ln TSRMLS_CC)) {
if ((res=inifile_key_cmp(ln.key, key TSRMLS_CC)) 2) {
-php_error_docref(NULL TSRMLS_CC, E_NOTICE, Found group: %d, *pos_grp_start);
ret = SUCCESS;
break;
}
-408,7 +406,6
ln.key.group = estrdup(key-group);
while(inifile_read(dba, ln TSRMLS_CC)) {
if (inifile_key_cmp(ln.key, key TSRMLS_CC) == 2) {
-php_error_docref(NULL TSRMLS_CC, E_NOTICE, Found next group: %d, *pos_grp_start);
ret = SUCCESS;
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c file.c file.h html.c
iliaa Sat Feb 22 15:33:11 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c file.c file.h html.c
Log:
int/long change.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.584
php4/ext/standard/basic_functions.c:1.585
--- php4/ext/standard/basic_functions.c:1.584 Fri Feb 21 03:45:57 2003
+++ php4/ext/standard/basic_functions.c Sat Feb 22 15:33:11 2003
-17,7 +17,7
+--+
*/
-/* $Id: basic_functions.c,v 1.584 2003/02/21 08:45:57 sniper Exp $ */
+/* $Id: basic_functions.c,v 1.585 2003/02/22 20:33:11 iliaa Exp $ */
#include php.h
#include php_streams.h
-670,6 +670,7
PHP_STATIC_FE(tmpfile,php_if_tmpfile,
NULL)
PHP_FE(file,
NULL)
PHP_FE(file_get_contents,
NULL)
+ PHP_FE(file_write_content,
NULL)
PHP_FE(stream_select,
first_through_third_args_force_ref)
PHP_FE(stream_context_create,
NULL)
PHP_FE(stream_context_set_params,
NULL)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.307 php4/ext/standard/file.c:1.308
--- php4/ext/standard/file.c:1.307 Tue Feb 18 10:15:22 2003
+++ php4/ext/standard/file.cSat Feb 22 15:33:11 2003
-21,7 +21,7
+--+
*/
-/* $Id: file.c,v 1.307 2003/02/18 15:15:22 moriyoshi Exp $ */
+/* $Id: file.c,v 1.308 2003/02/22 20:33:11 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
-406,6 +406,67
php_stream_close(md.stream);
}
+/* }}} */
+
+/* {{{ proto int file_write_content(string filename, mixed content [, char mode [,
bool use_include_path]])
+ Write a string to a file. */
+PHP_FUNCTION(file_write_content)
+{
+ zval *content;
+ char *filename, *mode;
+ int filename_len, mode_len = 0;
+ zend_bool use_include_path = 0;
+ size_t written;
+ php_stream *stream;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|sb, filename,
filename_len, content, mode, mode_len, use_include_path) == FAILURE) {
+ RETURN_FALSE;
+ }
+
+ if (!(stream = php_stream_open_wrapper(filename, (mode_len ? mode : wb),
(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL))) {
+ RETURN_FALSE;
+ }
+
+ /* try to set an exclusive lock on the file to prevent access to the file
while the write operation
+* is happening.
+*/
+ php_stream_set_option(stream, PHP_STREAM_OPTION_LOCKING, F_SETLKW, (void *)
F_WRLCK TSRMLS_CC);
+
+ if (Z_TYPE_P(content) == IS_ARRAY) {
+ HashPosition pos;
+ zval **tmp;
+ size_t cur_write;
+
+ written = 0;
+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(content), pos);
+
+ while (zend_hash_get_current_data_ex(Z_ARRVAL_P(content), (void **)
tmp, pos) == SUCCESS) {
+ SEPARATE_ZVAL(tmp);
+ convert_to_string(*tmp);
+
+ if ((cur_write = php_stream_write(stream, Z_STRVAL_PP(tmp),
Z_STRLEN_PP(tmp))) 0) {
+ RETVAL_FALSE;
+ goto done;
+ }
+ written += cur_write;
+
+ zend_hash_move_forward_ex(Z_ARRVAL_P(content), pos);
+ }
+ RETVAL_LONG(written);
+ } else {
+ SEPARATE_ZVAL(content);
+ convert_to_string(content);
+ if ((written = php_stream_write(stream, Z_STRVAL_P(content),
Z_STRLEN_P(content))) 0) {
+ RETVAL_FALSE;
+ } else {
+ RETVAL_LONG(written);
+ }
+ zval_ptr_dtor(content);
+ }
+
+done:
+ php_stream_close(stream);
+}
/* }}} */
/* {{{ proto string file_get_contents(string filename [, bool use_include_path])
Index: php4/ext/standard/file.h
diff -u php4/ext/standard/file.h:1.75 php4/ext/standard/file.h:1.76
--- php4/ext/standard/file.h:1.75 Mon Feb 10 17:26:53 2003
+++ php4/ext/standard/file.hSat Feb 22 15:33:11 2003
-16,7 +16,7
[PHP-CVS] cvs: php4 /ext/standard basic_functions.c file.c file.h
iliaa Sat Feb 22 15:35:22 2003 EDT
Modified files:
/php4/ext/standard basic_functions.c file.c file.h
Log:
Revent previous patch, adding of file_write_content() was premature.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.585
php4/ext/standard/basic_functions.c:1.586
--- php4/ext/standard/basic_functions.c:1.585 Sat Feb 22 15:33:11 2003
+++ php4/ext/standard/basic_functions.c Sat Feb 22 15:35:22 2003
-17,7 +17,7
+--+
*/
-/* $Id: basic_functions.c,v 1.585 2003/02/22 20:33:11 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.586 2003/02/22 20:35:22 iliaa Exp $ */
#include php.h
#include php_streams.h
-670,7 +670,6
PHP_STATIC_FE(tmpfile,php_if_tmpfile,
NULL)
PHP_FE(file,
NULL)
PHP_FE(file_get_contents,
NULL)
- PHP_FE(file_write_content,
NULL)
PHP_FE(stream_select,
first_through_third_args_force_ref)
PHP_FE(stream_context_create,
NULL)
PHP_FE(stream_context_set_params,
NULL)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.308 php4/ext/standard/file.c:1.309
--- php4/ext/standard/file.c:1.308 Sat Feb 22 15:33:11 2003
+++ php4/ext/standard/file.cSat Feb 22 15:35:22 2003
-21,7 +21,7
+--+
*/
-/* $Id: file.c,v 1.308 2003/02/22 20:33:11 iliaa Exp $ */
+/* $Id: file.c,v 1.309 2003/02/22 20:35:22 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
-406,67 +406,6
php_stream_close(md.stream);
}
-/* }}} */
-
-/* {{{ proto int file_write_content(string filename, mixed content [, char mode [,
bool use_include_path]])
- Write a string to a file. */
-PHP_FUNCTION(file_write_content)
-{
- zval *content;
- char *filename, *mode;
- int filename_len, mode_len = 0;
- zend_bool use_include_path = 0;
- size_t written;
- php_stream *stream;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|sb, filename,
filename_len, content, mode, mode_len, use_include_path) == FAILURE) {
- RETURN_FALSE;
- }
-
- if (!(stream = php_stream_open_wrapper(filename, (mode_len ? mode : wb),
(use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL))) {
- RETURN_FALSE;
- }
-
- /* try to set an exclusive lock on the file to prevent access to the file
while the write operation
-* is happening.
-*/
- php_stream_set_option(stream, PHP_STREAM_OPTION_LOCKING, F_SETLKW, (void *)
F_WRLCK TSRMLS_CC);
-
- if (Z_TYPE_P(content) == IS_ARRAY) {
- HashPosition pos;
- zval **tmp;
- size_t cur_write;
-
- written = 0;
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(content), pos);
-
- while (zend_hash_get_current_data_ex(Z_ARRVAL_P(content), (void **)
tmp, pos) == SUCCESS) {
- SEPARATE_ZVAL(tmp);
- convert_to_string(*tmp);
-
- if ((cur_write = php_stream_write(stream, Z_STRVAL_PP(tmp),
Z_STRLEN_PP(tmp))) 0) {
- RETVAL_FALSE;
- goto done;
- }
- written += cur_write;
-
- zend_hash_move_forward_ex(Z_ARRVAL_P(content), pos);
- }
- RETVAL_LONG(written);
- } else {
- SEPARATE_ZVAL(content);
- convert_to_string(content);
- if ((written = php_stream_write(stream, Z_STRVAL_P(content),
Z_STRLEN_P(content))) 0) {
- RETVAL_FALSE;
- } else {
- RETVAL_LONG(written);
- }
- zval_ptr_dtor(content);
- }
-
-done:
- php_stream_close(stream);
-}
/* }}} */
/* {{{ proto string file_get_contents(string filename [, bool use_include_path])
Index: php4/ext/standard/file.h
diff -u php4/ext/standard/file.h:1.76 php4/ext/standard/file.h:1.77
--- php4/ext/standard/file.h:1.76 Sat Feb 22 15:33:11 2003
+++ php4/ext/standard/file.hSat Feb 22 15:35:22 2003
-16,7 +16,7
[PHP-CVS] cvs: php4(PHP_4_3) / NEWS
wez Sat Feb 22 15:51:13 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: Correct a bug number - thanks to Philip... Index: php4/NEWS diff -u php4/NEWS:1.1247.2.104 php4/NEWS:1.1247.2.105 --- php4/NEWS:1.1247.2.104 Sat Feb 22 06:30:06 2003 +++ php4/NEWS Sat Feb 22 15:51:13 2003 -57,6 +57,7 (Ilia) - Fixed bug #22017 (date() does not support negative timestamps on win32). (Ilia) - Fixed bug #21998 (array_pop() did not reset the current array position). (Jani) +- Fixed bug #21885 (move_uploaded_file() does not ignore open_basedir). (Wez) - Fixed bug #21815 (fpassthru() ignored buffered data but complained anyway). (Wez) - Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez) -98,7 +99,6 - Fixed bug #21228 (broken check for ob_gzhandler and made ob_start() return the correct value). (Ilia) - Fixed bug #21226 (parse_url handling of urls without a path). (Ilia) -- Fixed bug #21185 (move_uploaded_file() does not ignore open_basedir). (Wez) - Fixed bug #21169 (Compile Failure and lots of warnings on UnixWare). (Derick) - Fixed bug #21131 (fopen() with mode 'a+' and rewind() doesn't work). (Wez) - Fixed bug #20857 (snmpset() failed always, patch by: [EMAIL PROTECTED]). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/dba/libinifile inifile.c
helly Sat Feb 22 18:47:10 2003 EDT
Modified files:
/php4/ext/dba/libinifileinifile.c
Log:
Dropped optimization
# It is impossible to combine skip=-1 searches with firstkey/nextkey results
Index: php4/ext/dba/libinifile/inifile.c
diff -u php4/ext/dba/libinifile/inifile.c:1.3 php4/ext/dba/libinifile/inifile.c:1.4
--- php4/ext/dba/libinifile/inifile.c:1.3 Sat Feb 22 15:49:07 2003
+++ php4/ext/dba/libinifile/inifile.c Sat Feb 22 18:47:09 2003
-16,7 +16,7
+--+
*/
-/* $Id: inifile.c,v 1.3 2003/02/22 20:49:07 helly Exp $ */
+/* $Id: inifile.c,v 1.4 2003/02/22 23:47:09 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
-44,7 +44,7
/* {{{ inifile_version */
char *inifile_version()
{
- return 1.0, $Revision: 1.3 $;
+ return 1.0, $Revision: 1.4 $;
}
/* }}} */
-254,40 +254,12
val_type val;
int res, grp_eq = 0;
- if (skip == -1) {
- if (dba-next.key.group dba-next.key.name
!inifile_key_cmp(dba-next.key, key TSRMLS_CC)) {
- /* we got it already from last fetch */
- val.value = estrdup(dba-next.val.value ? dba-next.val.value
: );
- /* allow faster access by automatically getting next key */
- php_stream_seek(dba-fp, dba-next.pos, SEEK_SET);
- ln.key.group = estrdup(dba-next.key.group ?
dba-next.key.group : );
- inifile_read(dba, ln TSRMLS_CC);
- inifile_line_free(dba-next);
- dba-next = ln;
- return val;
- } else if (dba-curr.key.group dba-curr.key.name
!inifile_key_cmp(dba-curr.key, key TSRMLS_CC)) {
- /* we got it already from firstkey/lastkey */
- /*
-* this optimisation does not work when firstkey/nextkey found
-* any instance other than the one instance wanted.
-*/
- val.value = estrdup(dba-curr.val.value ? dba-curr.val.value
: );
- /* allow faster access by automatically getting next key
-* we must use the line pointer 'next' since we cannot change
the
-* line pointer of firstkey/nextkey
-*/
- php_stream_seek(dba-fp, dba-curr.pos, SEEK_SET);
- ln.key.group = estrdup(dba-curr.key.group ?
dba-curr.key.group : );
- inifile_read(dba, ln TSRMLS_CC);
- inifile_line_free(dba-next);
- dba-next = ln;
- return val;
- }
- }
-
- /* the slow way: restart and seacrch */
- if (skip != -1 || !dba-next.key.group || !dba-next.key.name ||
inifile_key_cmp(dba-next.key, key TSRMLS_CC)) {
+ if (skip == -1 dba-next.key.group dba-next.key.name
!inifile_key_cmp(dba-next.key, key TSRMLS_CC)) {
+ /* we got position already from last fetch */
+ php_stream_seek(dba-fp, dba-next.pos, SEEK_SET);
+ } else {
/* specific instance or not same key - restart search */
+ /* the slow way: restart and seacrch */
php_stream_rewind(dba-fp);
}
inifile_line_free(dba-next);
-298,10 +270,10
if (!(res=inifile_key_cmp(ln.key, key TSRMLS_CC))) {
if (!skip) {
val.value = estrdup(ln.val.value ? ln.val.value : );
- /* allow faster access by automatically getting next
key */
- inifile_read(dba, ln TSRMLS_CC);
+ /* allow faster access by updating key read into next
*/
inifile_line_free(dba-next);
dba-next = ln;
+ dba-next.pos = php_stream_tell(dba-fp);;
return val;
}
skip--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
sniper Sat Feb 22 21:24:51 2003 EDT Modified files: /php4 NEWS Log: Style Index: php4/NEWS diff -u php4/NEWS:1.1355 php4/NEWS:1.1356 --- php4/NEWS:1.1355Sat Feb 22 20:32:03 2003 +++ php4/NEWS Sat Feb 22 21:24:51 2003 -1,9 +1,6 PHP 4 NEWS ||| ? ? ??? 200?, Version 5.0.0 -- Added dba handler inifiles to support ini files. (Marcus) -- Input Filter support added. See README.input_filter. (Rasmus) -- Updated IFX_VERSION entry to work with new Version output of ESQL/C (Corne') - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi - Fixed bug #21985 and #22064 (various mb_send_mail() issues). (Moriyoshi) -17,6 +14,8 - Changed array_search() to accept also objects as a needle. (Moriyoshi) - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) - Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) +- Added DBA handler 'inifiles' to support ini files. (Marcus) +- Added filter support. See README.input_filter. (Rasmus) - Added session.hash_function and session.hash_bits_per_character. (Sascha) - Added lightweight streaming input abstraction to the Zend Engine scanners that provides uniform support for include()'ing data from PHP streams across -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2filter EXPERIMENTAL /sapi/apache2handler EXPERIMENTAL
sniper Sat Feb 22 21:39:51 2003 EDT Added files: /php4/sapi/apache2filterEXPERIMENTAL /php4/sapi/apache2handler EXPERIMENTAL Log: These both are experimental still. (there has been a note in config.m4 all the time but these marker files were missing) -- 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/apache2filter EXPERIMENTAL
sniper Sat Feb 22 21:40:07 2003 EDT Added files: (Branch: PHP_4_3) /php4/sapi/apache2filterEXPERIMENTAL Log: MFH -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 / NEWS
helly Sat Feb 22 21:45:11 2003 EDT Modified files: /php4 NEWS Log: Fix the name # but yes Jani your sentence has better style Index: php4/NEWS diff -u php4/NEWS:1.1356 php4/NEWS:1.1357 --- php4/NEWS:1.1356Sat Feb 22 21:24:51 2003 +++ php4/NEWS Sat Feb 22 21:45:10 2003 -14,7 +14,7 - Changed array_search() to accept also objects as a needle. (Moriyoshi) - Changed ext/mcrypt to require libmcrypt version 2.5.6 or greater. (Derick) - Changed uniqid() parameters to be optional and allow any prefix length. (Marcus) -- Added DBA handler 'inifiles' to support ini files. (Marcus) +- Added DBA handler 'inifile' to support ini files. (Marcus) - Added filter support. See README.input_filter. (Rasmus) - Added session.hash_function and session.hash_bits_per_character. (Sascha) - Added lightweight streaming input abstraction to the Zend Engine scanners -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /tests/classes abstract_inherit.phpt
helly Sat Feb 22 22:03:10 2003 EDT
Added files:
/php4/tests/classes abstract_inherit.phpt
Log:
New test which currently fails
Index: php4/tests/classes/abstract_inherit.phpt
+++ php4/tests/classes/abstract_inherit.phpt
--TEST--
A class that inherits a abstrcat method is abstract
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class pass {
abstract function show();
}
class fail extends pass {
}
$t = new fail();
$t = new pass();
echo Done\n; // Shouldn't be displayed
?
--EXPECTF--
Fatal error: Cannot instantiate abstract class fail 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 /sapi/apache config.m4 /sapi/apache2filter config.m4 /sapi/apache2handler config.m4
sniper Sun Feb 23 02:32:03 2003 EDT
Modified files:
/php4/sapi/apache config.m4
/php4/sapi/apache2filterconfig.m4
/php4/sapi/apache2handler config.m4
Log:
- Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.66 php4/sapi/apache/config.m4:1.67
--- php4/sapi/apache/config.m4:1.66 Thu Feb 13 02:47:21 2003
+++ php4/sapi/apache/config.m4 Sun Feb 23 02:32:03 2003
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.66 2003/02/13 07:47:21 sniper Exp $
+dnl $Id: config.m4,v 1.67 2003/02/23 07:32:03 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
-70,7 +70,19
if test $? != 0; then
APACHE_INSTALL=$APXS -i -a -n php4 $SAPI_SHARED # Old apxs does not have -S
option
else
-APACHE_INSTALL=\$(mkinstalldirs) \\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\
$APXS -S LIBEXECDIR=\\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\ -i -a -n php4
$SAPI_SHARED
+APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+if test -z `$APXS -q SYSCONFDIR`; then
+ APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4 $SAPI_SHARED
+else
+ APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+ APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4 $SAPI_SHARED
+fi
fi
if test -z `$APXS -q LD_SHLIB` || test `$APXS -q LIBEXECDIR` = modules; then
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.27 php4/sapi/apache2filter/config.m4:1.28
--- php4/sapi/apache2filter/config.m4:1.27 Mon Feb 3 12:35:10 2003
+++ php4/sapi/apache2filter/config.m4 Sun Feb 23 02:32:03 2003
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.27 2003/02/03 17:35:10 sniper Exp $
+dnl $Id: config.m4,v 1.28 2003/02/23 07:32:03 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
-52,12 +52,17
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-optarg=
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4
else
-optarg=-a
+APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+\$(mkinstalldirs) '$APXS_SYSCONFDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4
fi
-
- INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR $APXS -S
LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
case $host_alias in
*aix*)
Index: php4/sapi/apache2handler/config.m4
diff -u php4/sapi/apache2handler/config.m4:1.1 php4/sapi/apache2handler/config.m4:1.2
--- php4/sapi/apache2handler/config.m4:1.1 Tue Feb 11 12:40:11 2003
+++ php4/sapi/apache2handler/config.m4 Sun Feb 23 02:32:03 2003
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.1 2003/02/11 17:40:11 ianh Exp $
+dnl $Id: config.m4,v 1.2 2003/02/23 07:32:03 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
-52,12 +52,17
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-optarg=
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4
else
-optarg=-a
+APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+\$(mkinstalldirs) '$APXS_SYSCONFDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4
fi
-
- INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR $APXS -S
LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
case $host_alias in
*aix*)
--
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/apache config.m4 /sapi/apache2filter config.m4
sniper Sun Feb 23 02:34:32 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/apache config.m4
/php4/sapi/apache2filterconfig.m4
Log:
MFH: - Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
Index: php4/sapi/apache/config.m4
diff -u php4/sapi/apache/config.m4:1.62.4.4 php4/sapi/apache/config.m4:1.62.4.5
--- php4/sapi/apache/config.m4:1.62.4.4 Thu Feb 13 02:48:00 2003
+++ php4/sapi/apache/config.m4 Sun Feb 23 02:34:32 2003
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.62.4.4 2003/02/13 07:48:00 sniper Exp $
+dnl $Id: config.m4,v 1.62.4.5 2003/02/23 07:34:32 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 1.x module support via DSO through APXS)
-70,7 +70,19
if test $? != 0; then
APACHE_INSTALL=$APXS -i -a -n php4 $SAPI_SHARED # Old apxs does not have -S
option
else
-APACHE_INSTALL=\$(mkinstalldirs) \\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\
$APXS -S LIBEXECDIR=\\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\ -i -a -n php4
$SAPI_SHARED
+APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+if test -z `$APXS -q SYSCONFDIR`; then
+ APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4 $SAPI_SHARED
+else
+ APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+ APACHE_INSTALL=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4 $SAPI_SHARED
+fi
fi
if test -z `$APXS -q LD_SHLIB` || test `$APXS -q LIBEXECDIR` = modules; then
Index: php4/sapi/apache2filter/config.m4
diff -u php4/sapi/apache2filter/config.m4:1.25.2.2
php4/sapi/apache2filter/config.m4:1.25.2.3
--- php4/sapi/apache2filter/config.m4:1.25.2.2 Mon Feb 3 12:35:39 2003
+++ php4/sapi/apache2filter/config.m4 Sun Feb 23 02:34:32 2003
-1,5 +1,5
dnl
-dnl $Id: config.m4,v 1.25.2.2 2003/02/03 17:35:39 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.3 2003/02/23 07:34:32 sniper Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 module support via DSO through APXS)
-52,12 +52,17
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
if test -z `$APXS -q SYSCONFDIR`; then
-optarg=
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -i -n php4
else
-optarg=-a
+APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+INSTALL_IT=\$(mkinstalldirs) '$APXS_LIBEXECDIR' \
+\$(mkinstalldirs) '$APXS_SYSCONFDIR' \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -i -a -n php4
fi
-
- INSTALL_IT='$(mkinstalldirs) '$APXS_LIBEXECDIR $APXS -S
LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4
case $host_alias in
*aix*)
--
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 Sun Feb 23 02:35:57 2003 EDT Modified files: (Branch: PHP_4_3) /php4 NEWS Log: BFN Index: php4/NEWS diff -u php4/NEWS:1.1247.2.105 php4/NEWS:1.1247.2.106 --- php4/NEWS:1.1247.2.105 Sat Feb 22 15:51:13 2003 +++ php4/NEWS Sun Feb 23 02:35:57 2003 -21,6 +21,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 #22376 (wrong httpd.conf modified when using INSTALL_ROOT). (Jani) - Fixed bug #22363 (combinations of fwrite(), fread() and fseek() produce unexpected results). (Wez) - Fixed bug #22330 (overloaded strrpos() gives wrong results). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
