[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Aug 8 01:32:21 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3131r2=1.3132diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3131 php-src/ChangeLog:1.3132 --- php-src/ChangeLog:1.3131Thu Aug 7 01:32:27 2008 +++ php-src/ChangeLog Fri Aug 8 01:32:20 2008 @@ -1,3 +1,289 @@ +2008-08-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + - dbase moved to pecl + +* ext/dbase/.cvsignore + ext/dbase/CREDITS + ext/dbase/config.m4 + ext/dbase/config.w32 + ext/dbase/dbase.c + ext/dbase/dbase.dsp + ext/dbase/dbf.h + ext/dbase/dbf_head.c + ext/dbase/dbf_head.h + ext/dbase/dbf_misc.c + ext/dbase/dbf_misc.h + ext/dbase/dbf_ndx.c + ext/dbase/dbf_ndx.h + ext/dbase/dbf_rec.c + ext/dbase/dbf_rec.h + ext/dbase/package.xml + ext/dbase/php_dbase.h + ext/dbase/tests/.cvsignore + ext/dbase/tests/001.phpt + ext/dbase/tests/002.phpt + ext/dbase/tests/bug31754.phpt: + - moved to pecl + +* (PHP_5_3) + ext/zip/config.w32 + ext/zip/lib/.cvsignore + ext/zip/lib/zip.h + ext/zip/lib/zip_close.c + ext/zip/lib/zip_dirent.c + ext/zip/lib/zip_err_str.c + ext/zip/lib/zip_filerange_crc.c + ext/zip/lib/zip_get_archive_flag.c + ext/zip/lib/zip_open.c + ext/zip/lib/zip_rename.c + ext/zip/lib/zip_set_archive_flag.c + ext/zip/lib/zip_source_file.c + ext/zip/lib/zip_source_filep.c + ext/zip/lib/zip_source_zip.c + ext/zip/lib/zip_unchange_archive.c + ext/zip/lib/zipint.h: + - MFH: update to 0.9 (torrentzip support, files open only when necessary), + windows fixes + +* ext/zip/lib/zip_filerange_crc.c + ext/zip/lib/zip_filerange_crc.c + ext/zip/lib/zip_fopen.c + ext/zip/lib/zip_fopen_index.c + ext/zip/lib/zip_fread.c + ext/zip/lib/zip_free.c + ext/zip/lib/zip_get_archive_comment.c + ext/zip/lib/zip_get_archive_flag.c + ext/zip/lib/zip_get_archive_flag.c + ext/zip/lib/zip_get_file_comment.c + ext/zip/lib/zip_get_name.c + ext/zip/lib/zip_get_num_files.c + ext/zip/lib/zip_memdup.c + ext/zip/lib/zip_name_locate.c + ext/zip/lib/zip_new.c + ext/zip/lib/zip_open.c + ext/zip/lib/zip_rename.c + ext/zip/lib/zip_replace.c + ext/zip/lib/zip_set_archive_comment.c + ext/zip/lib/zip_set_archive_flag.c + ext/zip/lib/zip_set_archive_flag.c + ext/zip/lib/zip_set_file_comment.c + ext/zip/lib/zip_set_name.c + ext/zip/lib/zip_source_buffer.c + ext/zip/lib/zip_source_file.c + ext/zip/lib/zip_source_filep.c + ext/zip/lib/zip_source_free.c + ext/zip/lib/zip_source_function.c + ext/zip/lib/zip_source_zip.c + ext/zip/lib/zip_stat.c + ext/zip/lib/zip_stat_index.c + ext/zip/lib/zip_stat_init.c + ext/zip/lib/zip_strerror.c + ext/zip/lib/zip_unchange.c + ext/zip/lib/zip_unchange_all.c + ext/zip/lib/zip_unchange_archive.c + ext/zip/lib/zip_unchange_data.c + ext/zip/lib/zip_win32.h + ext/zip/lib/zipint.h: + + - update to 0.9 (torrentzip support, files open only when necessary), + windows fixes + +* ext/zip/config.w32 + ext/zip/lib/zip.h + ext/zip/lib/zip_add.c + ext/zip/lib/zip_add_dir.c + ext/zip/lib/zip_close.c + ext/zip/lib/zip_delete.c + ext/zip/lib/zip_dirent.c + ext/zip/lib/zip_entry_free.c + ext/zip/lib/zip_entry_new.c + ext/zip/lib/zip_err_str.c + ext/zip/lib/zip_error.c + ext/zip/lib/zip_error_clear.c + ext/zip/lib/zip_error_get.c + ext/zip/lib/zip_error_get_sys_type.c + ext/zip/lib/zip_error_strerror.c + ext/zip/lib/zip_error_to_str.c + ext/zip/lib/zip_fclose.c + ext/zip/lib/zip_file_error_clear.c + ext/zip/lib/zip_file_error_get.c + ext/zip/lib/zip_file_get_offset.c + ext/zip/lib/zip_file_strerror.c: + - update to 0.9 (torrentzip support, files open only when necessary), + windows fixes + +2008-08-07 Felix De Vliegher [EMAIL PROTECTED] + +* ext/standard/tests/filters/stream_filter_remove_basic.phpt + ext/standard/tests/filters/stream_filter_remove_error.phpt: + MFB: Basic and error tests for stream_filter_remove(). + +* ext/standard/tests/filters/stream_filter_remove_basic.phpt + ext/standard/tests/filters/stream_filter_remove_basic.phpt + ext/standard/tests/filters/stream_filter_remove_error.phpt + ext/standard/tests/filters/stream_filter_remove_error.phpt: + + file stream_filter_remove_basic.phpt was initially added on branch + PHP_5_3. + +2008-08-07 Nuno Lopes [EMAIL PROTECTED] + +* sapi/litespeed/config.m4: + MFB: fix build + +* (PHP_5_3) + sapi/litespeed/config.m4: + fix this, so that I can
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Aug 8 01:32:25 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1354r2=1.1355diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1354 ZendEngine2/ChangeLog:1.1355 --- ZendEngine2/ChangeLog:1.1354Wed Aug 6 01:32:27 2008 +++ ZendEngine2/ChangeLog Fri Aug 8 01:32:24 2008 @@ -1,3 +1,59 @@ +2008-08-07 Dmitry Stogov [EMAIL PROTECTED] + +* zend_closures.c + zend_closures.c: + Disable closures serialization/unserialization + +2008-08-07 Nuno Lopes [EMAIL PROTECTED] + +* zend_ini_scanner.c + zend_ini_scanner.c + zend_ini_scanner_defs.h + zend_ini_scanner_defs.h: + regenerate + +* zend_ini_scanner.l: + MFB: fix crash + +* (PHP_5_3) + zend_ini_scanner.l: + fix crash: yytext can't be modified because it is mmaped(). strndup() will + take care of last zero char + +2008-08-07 Dmitry Stogov [EMAIL PROTECTED] + +* zend_API.c + zend_API.c + tests/bug45744.phpt + tests/bug45744.phpt + tests/bug45744.phpt: + Fixed bug #45744 (Case sensitive callback behaviour) + +2008-08-07 Antony Dovgal [EMAIL PROTECTED] + +* zend_hash.c + zend_hash.c: + fix WS + +2008-08-07 Dmitry Stogov [EMAIL PROTECTED] + +* zend_hash.c + zend_hash.c + tests/bug45742.phpt + tests/bug45742.phpt + tests/bug45742.phpt: + Fixed bug #45742 (Wrong class array inpretetion using constant indexes) + +2008-08-07 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + zend_operators.c: + MFH: fix bug #45712 ($something == NaN returns true with 5.3, false with + 5.2.*) + +* zend_operators.c: + fix bug #45712 ($something == NaN returns true with 5.3, false with 5.2.*) + 2008-08-05 Stanislav Malyshev [EMAIL PROTECTED] * zend_operators.h: @@ -25275,7 +25331,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1354 2008/08/06 01:32:27 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1355 2008/08/08 01:32:24 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26999,7 +27055,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1354 2008/08/06 01:32:27 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1355 2008/08/08 01:32:24 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
tony2001Thu Aug 7 08:36:15 2008 UTC Modified files: /ZendEngine2zend_operators.c /php-src/ext/standard/tests/mathbug45712.phpt Log: fix bug #45712 ($something == NaN returns true with 5.3, false with 5.2.*) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.292r2=1.293diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.292 ZendEngine2/zend_operators.c:1.293 --- ZendEngine2/zend_operators.c:1.292 Thu Jul 24 20:38:43 2008 +++ ZendEngine2/zend_operators.cThu Aug 7 08:36:15 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_operators.c,v 1.292 2008/07/24 20:38:43 moriyoshi Exp $ */ +/* $Id: zend_operators.c,v 1.293 2008/08/07 08:36:15 tony2001 Exp $ */ #include ctype.h @@ -1975,15 +1975,18 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZVAL_LONG(result, Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?1:(Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - (double)Z_LVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZVAL_LONG(result, ((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?1:(((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = (double)Z_LVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZVAL_LONG(result, Z_DVAL_P(op1)Z_DVAL_P(op2)?1:(Z_DVAL_P(op1)Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_ARRAY, IS_ARRAY): http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/math/bug45712.phpt diff -u php-src/ext/standard/tests/math/bug45712.phpt:1.1 php-src/ext/standard/tests/math/bug45712.phpt:1.2 --- php-src/ext/standard/tests/math/bug45712.phpt:1.1 Tue Aug 5 12:36:21 2008 +++ php-src/ext/standard/tests/math/bug45712.phpt Thu Aug 7 08:36:15 2008 @@ -50,13 +50,13 @@ bool(false) bool(false) bool(false) -bool(true) bool(false) bool(false) bool(false) bool(false) bool(false) -bool(true) +bool(false) +bool(false) float(INF) bool(true) bool(false) @@ -64,7 +64,7 @@ bool(false) bool(false) bool(false) -bool(true) +bool(false) bool(false) bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
tony2001Thu Aug 7 08:36:24 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2zend_operators.c /php-src/ext/standard/tests/mathbug45712.phpt Log: MFH: fix bug #45712 ($something == NaN returns true with 5.3, false with 5.2.*) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.12r2=1.208.2.4.2.23.2.13diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.12 ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.13 --- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.12Thu Jul 24 20:39:48 2008 +++ ZendEngine2/zend_operators.cThu Aug 7 08:36:24 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.12 2008/07/24 20:39:48 moriyoshi Exp $ */ +/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.13 2008/08/07 08:36:24 tony2001 Exp $ */ #include ctype.h @@ -1383,15 +1383,18 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZVAL_LONG(result, Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?1:(Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - (double)Z_LVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZVAL_LONG(result, ((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?1:(((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = (double)Z_LVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZVAL_LONG(result, Z_DVAL_P(op1)Z_DVAL_P(op2)?1:(Z_DVAL_P(op1)Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_ARRAY, IS_ARRAY): http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/math/bug45712.phpt diff -u php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.2 php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.3 --- php-src/ext/standard/tests/math/bug45712.phpt:1.1.2.2 Tue Aug 5 12:36:47 2008 +++ php-src/ext/standard/tests/math/bug45712.phpt Thu Aug 7 08:36:24 2008 @@ -50,13 +50,13 @@ bool(false) bool(false) bool(false) -bool(true) bool(false) bool(false) bool(false) bool(false) bool(false) -bool(true) +bool(false) +bool(false) float(INF) bool(true) bool(false) @@ -64,7 +64,7 @@ bool(false) bool(false) bool(false) -bool(true) +bool(false) bool(false) bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/math bug45712.phpt
tony2001Thu Aug 7 08:52:11 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/mathbug45712.phpt Log: fix test NaN != NaN http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/math/bug45712.phpt diff -u php-src/ext/standard/tests/math/bug45712.phpt:1.1.4.2 php-src/ext/standard/tests/math/bug45712.phpt:1.1.4.3 --- php-src/ext/standard/tests/math/bug45712.phpt:1.1.4.2 Tue Aug 5 12:37:09 2008 +++ php-src/ext/standard/tests/math/bug45712.phpt Thu Aug 7 08:52:11 2008 @@ -50,13 +50,13 @@ bool(false) bool(false) bool(false) -bool(true) bool(false) bool(false) bool(false) bool(false) bool(false) -bool(true) +bool(false) +bool(false) float(INF) bool(true) bool(false) @@ -64,7 +64,7 @@ bool(false) bool(false) bool(false) -bool(true) +bool(false) bool(false) bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c filestat.c php_filestat.h /ext/standard/tests/file bug39367.phpt clearstatcache_001.phpt clearstatcache_error.phpt /main/streams plain_wrapper.
lbarnaudThu Aug 7 09:24:04 2008 UTC
Added files:
/php-src/ext/standard/tests/fileclearstatcache_001.phpt
Modified files:
/php-src/ext/standard basic_functions.c filestat.c php_filestat.h
/php-src/ext/standard/tests/filebug39367.phpt
clearstatcache_error.phpt
/php-src/main/streams plain_wrapper.c
Log:
Added clear_realpath_cache and filename parameters to clearstatcache() (Jani,
Arnaud)
[DOC] clearstatcache() now defaults to not affect the realpath cache.
clearstatcache() now takes two optionnal parameters, clear_realpath_cache to
clear the realpath cache (defaults to false), and filename to clear only the
given filename from the cache.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.912r2=1.913diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.912
php-src/ext/standard/basic_functions.c:1.913
--- php-src/ext/standard/basic_functions.c:1.912Sun Aug 3 12:04:57 2008
+++ php-src/ext/standard/basic_functions.c Thu Aug 7 09:24:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.912 2008/08/03 12:04:57 jani Exp $ */
+/* $Id: basic_functions.c,v 1.913 2008/08/07 09:24:04 lbarnaud Exp $ */
#include php.h
#include php_streams.h
@@ -1494,7 +1494,9 @@
#endif
static
-ZEND_BEGIN_ARG_INFO(arginfo_clearstatcache, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_clearstatcache, 0, 0, 0)
+ ZEND_ARG_INFO(0, clear_realpath_cache)
+ ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
static
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.173r2=1.174diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.173
php-src/ext/standard/filestat.c:1.174
--- php-src/ext/standard/filestat.c:1.173 Tue Mar 4 23:39:15 2008
+++ php-src/ext/standard/filestat.c Thu Aug 7 09:24:04 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.173 2008/03/04 23:39:15 felipe Exp $ */
+/* $Id: filestat.c,v 1.174 2008/08/07 09:24:04 lbarnaud Exp $ */
#include php.h
#include fopen_wrappers.h
@@ -780,8 +780,11 @@
/* {{{ php_clear_stat_cache()
*/
-PHPAPI void php_clear_stat_cache(TSRMLS_D)
+PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char
*filename, int filename_len TSRMLS_DC)
{
+ /* always clear CurrentStatFile and CurrentLStatFile even if filename
is not NULL
+* as it may contains outdated data (e.g. nlink for a directory when
deleting a file
+* in this directory, as shown by lstat_stat_variation9.phpt) */
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));
BG(CurrentStatFile) = NULL;
@@ -790,18 +793,40 @@
efree(BG(CurrentLStatFile));
BG(CurrentLStatFile) = NULL;
}
- realpath_cache_clean(TSRMLS_C);
+ if (clear_realpath_cache) {
+ if (filename != NULL) {
+ realpath_cache_del(filename, filename_len TSRMLS_CC);
+ } else {
+ realpath_cache_clean(TSRMLS_C);
+ }
+ }
}
/* }}} */
-/* {{{ proto void clearstatcache(void)
+/* {{{ proto void clearstatcache([bool clear_realpath_cache[, string
filename]])
Clear file stat cache */
PHP_FUNCTION(clearstatcache)
{
- if (zend_parse_parameters_none() == FAILURE) {
+ zend_bool clear_realpath_cache = 0;
+ char *filename = NULL;
+ zend_uchar filename_type;
+ int filename_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |bt,
clear_realpath_cache, filename, filename_len, filename_type) == FAILURE) {
return;
}
- php_clear_stat_cache(TSRMLS_C);
+
+ if (filename filename_type == IS_UNICODE) {
+ if (FAILURE == php_stream_path_encode(NULL, filename,
filename_len, (UChar*)filename, filename_len, REPORT_ERRORS,
FG(default_context))) {
+ RETURN_FALSE;
+ }
+ }
+
+ php_clear_stat_cache(clear_realpath_cache, filename, filename_len
TSRMLS_CC);
+
+ if (filename filename_type == IS_UNICODE) {
+ efree(filename);
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_filestat.h?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/standard/php_filestat.h
diff -u php-src/ext/standard/php_filestat.h:1.33
php-src/ext/standard/php_filestat.h:1.34
--- php-src/ext/standard/php_filestat.h:1.33Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/php_filestat.h Thu Aug 7 09:24:04 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id:
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard basic_functions.c filestat.c php_filestat.h /ext/standard/tests/file bug39367.phpt clearstatcache_001.phpt clearstatcache_error.phpt /main/strea
lbarnaudThu Aug 7 09:25:33 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/fileclearstatcache_001.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c filestat.c php_filestat.h
/php-src/ext/standard/tests/filebug39367.phpt
clearstatcache_error.phpt
/php-src/main/streams plain_wrapper.c
Log:
MFH:
Added clear_realpath_cache and filename parameters to clearstatcache() (Jani,
Arnaud)
[DOC] clearstatcache() now defaults to not affect the realpath cache.
clearstatcache() now takes two optionnal parameters, clear_realpath_cache to
clear the realpath cache (defaults to false), and filename to clear only the
given filename from the cache.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.253r2=1.2027.2.547.2.965.2.254diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.253
php-src/NEWS:1.2027.2.547.2.965.2.254
--- php-src/NEWS:1.2027.2.547.2.965.2.253 Wed Aug 6 21:31:45 2008
+++ php-src/NEWSThu Aug 7 09:25:32 2008
@@ -2,6 +2,8 @@
|||
?? ??? 200?, PHP 5.3.0 Alpha 2
- Removed shebang line check from CGI sapi (it is checked by scanner) (Dmitry)
+- Added clear_realpath_cache and filename parameters to clearstatcache() (Jani,
+ Arnaud)
- Added litespeed SAPI module. (George Wang)
- Added ext/hash support to ext/session's ID generator. (Sara)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.45r2=1.725.2.31.2.64.2.46diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.45
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.46
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.45 Sun Aug 3
12:15:55 2008
+++ php-src/ext/standard/basic_functions.c Thu Aug 7 09:25:32 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.45 2008/08/03 12:15:55 jani Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.46 2008/08/07 09:25:32 lbarnaud
Exp $ */
#include php.h
#include php_streams.h
@@ -1507,7 +1507,9 @@
#endif
static
-ZEND_BEGIN_ARG_INFO(arginfo_clearstatcache, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_clearstatcache, 0, 0, 0)
+ ZEND_ARG_INFO(0, clear_realpath_cache)
+ ZEND_ARG_INFO(0, filename)
ZEND_END_ARG_INFO()
static
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.14.2.6r2=1.136.2.8.2.14.2.7diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.6
php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.7
--- php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.6 Mon Mar 10 22:12:36 2008
+++ php-src/ext/standard/filestat.c Thu Aug 7 09:25:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.14.2.6 2008/03/10 22:12:36 felipe Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.14.2.7 2008/08/07 09:25:33 lbarnaud Exp $ */
#include php.h
#include safe_mode.h
@@ -712,8 +712,11 @@
/* {{{ php_clear_stat_cache()
*/
-PHPAPI void php_clear_stat_cache(TSRMLS_D)
+PHPAPI void php_clear_stat_cache(zend_bool clear_realpath_cache, const char
*filename, int filename_len TSRMLS_DC)
{
+ /* always clear CurrentStatFile and CurrentLStatFile even if filename
is not NULL
+* as it may contains outdated data (e.g. nlink for a directory when
deleting a file
+* in this directory, as shown by lstat_stat_variation9.phpt) */
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));
BG(CurrentStatFile) = NULL;
@@ -722,18 +725,29 @@
efree(BG(CurrentLStatFile));
BG(CurrentLStatFile) = NULL;
}
- realpath_cache_clean(TSRMLS_C);
+ if (clear_realpath_cache) {
+ if (filename != NULL) {
+ realpath_cache_del(filename, filename_len TSRMLS_CC);
+ } else {
+ realpath_cache_clean(TSRMLS_C);
+ }
+ }
}
/* }}} */
-/* {{{ proto void clearstatcache(void)
+/* {{{ proto void clearstatcache([bool clear_realpath_cache[, string
filename]])
Clear file stat cache */
PHP_FUNCTION(clearstatcache)
{
- if (zend_parse_parameters_none() == FAILURE) {
+ zend_bool clear_realpath_cache = 0;
+ char *filename = NULL;
+ intfilename_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |bs,
clear_realpath_cache, filename, filename_len) == FAILURE) {
return;
}
- php_clear_stat_cache(TSRMLS_C);
+
+
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/session session.c
Uh..this changes the behaviour quite dramatically.
See the failing tests now. You'd have to MFH quite a lot more to make it a
proper fix, so please, revert.
--Jani
Kalle Sommer Nielsen kirjoitti:
kalle Wed Aug 6 21:28:39 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/session session.c
Log:
Backport fix for #45406 - Patch by oleg dot grenrus at dynamoid dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.43r2=1.417.2.8.2.44diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.43
php-src/ext/session/session.c:1.417.2.8.2.44
--- php-src/ext/session/session.c:1.417.2.8.2.43Wed Jun 11 07:46:43 2008
+++ php-src/ext/session/session.c Wed Aug 6 21:28:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.43 2008/06/11 07:46:43 dmitry Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.44 2008/08/06 21:28:38 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1925,6 +1925,21 @@
}
}
+ if (PS(serializer) == NULL) {
+ char *value;
+
+ value = zend_ini_string(session.serialize_handler,
sizeof(session.serialize_handler), 0);
+ if (value) {
+ PS(serializer) = _php_find_ps_serializer(value
TSRMLS_CC);
+ }
+ }
+
+ if (PS(mod) == NULL || PS(serializer) == NULL) {
+ /* current status is unusable */
+ PS(session_status) = php_session_disabled;
+ return SUCCESS;
+ }
+
if (PS(auto_start)) {
php_session_start(TSRMLS_C);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
Antony Dovgal kirjoitti: tony2001Thu Aug 7 08:36:15 2008 UTC Modified files: /ZendEngine2 zend_operators.c /php-src/ext/standard/tests/math bug45712.phpt Log: fix bug #45712 ($something == NaN returns true with 5.3, false with 5.2.*) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.292r2=1.293diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.292 ZendEngine2/zend_operators.c:1.293 --- ZendEngine2/zend_operators.c:1.292 Thu Jul 24 20:38:43 2008 +++ ZendEngine2/zend_operators.cThu Aug 7 08:36:15 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: zend_operators.c,v 1.292 2008/07/24 20:38:43 moriyoshi Exp $ */ +/* $Id: zend_operators.c,v 1.293 2008/08/07 08:36:15 tony2001 Exp $ */ #include ctype.h @@ -1975,15 +1975,18 @@ return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_LONG): - ZVAL_LONG(result, Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?1:(Z_DVAL_P(op1)((double)Z_LVAL_P(op2))?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - (double)Z_LVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_LONG, IS_DOUBLE): - ZVAL_LONG(result, ((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?1:(((double)Z_LVAL_P(op1))Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = (double)Z_LVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_DOUBLE, IS_DOUBLE): - ZVAL_LONG(result, Z_DVAL_P(op1)Z_DVAL_P(op2)?1:(Z_DVAL_P(op1)Z_DVAL_P(op2)?-1:0)); + Z_DVAL_P(result) = Z_DVAL_P(op1) - Z_DVAL_P(op2); + ZVAL_LONG(result, ZEND_NORMALIZE_BOOL(Z_DVAL_P(result))); return SUCCESS; case TYPE_PAIR(IS_ARRAY, IS_ARRAY): http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/bug45712.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/math/bug45712.phpt diff -u php-src/ext/standard/tests/math/bug45712.phpt:1.1 php-src/ext/standard/tests/math/bug45712.phpt:1.2 --- php-src/ext/standard/tests/math/bug45712.phpt:1.1 Tue Aug 5 12:36:21 2008 +++ php-src/ext/standard/tests/math/bug45712.phpt Thu Aug 7 08:36:15 2008 @@ -50,13 +50,13 @@ bool(false) bool(false) bool(false) -bool(true) bool(false) bool(false) bool(false) bool(false) bool(false) -bool(true) +bool(false) +bool(false) float(INF) bool(true) bool(false) @@ -64,7 +64,7 @@ bool(false) bool(false) bool(false) -bool(true) +bool(false) bool(false) bool(false) bool(false) You fixed by changing the test to be wrong? :) Is not $nan == $nan or $nan === $nan true ? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
On 07.08.2008 14:02, Jani Taskinen wrote: You fixed by changing the test to be wrong? :) No, I fixed the test to show the same behavior with 4.4, 5.2, 5.3 and HEAD. I also fixed comparison of NaN with empty strings and numbers. Is not $nan == $nan or $nan === $nan true ? No, they are not equal: A NaN does not compare equal to any floating-point number or NaN, even if the latter has an identical representation. One can therefore test whether a variable has a NaN value by comparing it to itself (i.e. if then x is NaN). http://en.wikipedia.org/wiki/NaN -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
janiThu Aug 7 10:10:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Tune news, added missing entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.254r2=1.2027.2.547.2.965.2.255diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.254 php-src/NEWS:1.2027.2.547.2.965.2.255 --- php-src/NEWS:1.2027.2.547.2.965.2.254 Thu Aug 7 09:25:32 2008 +++ php-src/NEWSThu Aug 7 10:10:58 2008 @@ -1,25 +1,27 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.3.0 Alpha 2 -- Removed shebang line check from CGI sapi (it is checked by scanner) (Dmitry) -- Added clear_realpath_cache and filename parameters to clearstatcache() (Jani, - Arnaud) +- Removed shebang line check from CGI sapi (it is checked by scanner). (Dmitry) +- Changed session_start() to return false when session startup fails. (Jani) + +- Added optional clear_realpath_cache and filename parameters to + clearstatcache(). (Jani, Arnaud) - Added litespeed SAPI module. (George Wang) - Added ext/hash support to ext/session's ID generator. (Sara) -- Fixed a bug that caused miscalculations with the last weekday of n - month relative time string. (Derick) +- Fixed a bug causing miscalculations with the last weekday of n month + relative time string. (Derick) - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). (Derick) - Fixed bug #45696 (Not all DateTime methods allow method chaining). (Derick) - Fixed bug #45636 (fileinfo ext duplicate strndup). (Derick) -- Fixed bug #45545 (DateInterval has a limitation of 4 chars for ISO - durations). (Derick) +- Fixed bug #45545 (DateInterval has 4 char limitation for ISO durations). + (Derick) - Fixed bug #44100 (Inconsistent handling of static array declarations with duplicate keys). (Dmitry) -- Fixed bug #43008 (php://filter uris ignore url encoded filternames and can't +- Fixed bug #43008 (php://filter uris ignore url encoded filternames and can't handle slashes). (Arnaud) 01 Aug 2008, PHP 5.3.0 Alpha 1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
Antony Dovgal kirjoitti: On 07.08.2008 14:02, Jani Taskinen wrote: You fixed by changing the test to be wrong? :) No, I fixed the test to show the same behavior with 4.4, 5.2, 5.3 and HEAD. I also fixed comparison of NaN with empty strings and numbers. Ok. Is not $nan == $nan or $nan === $nan true ? No, they are not equal: A NaN does not compare equal to any floating-point number or NaN, even if the latter has an identical representation. One can therefore test whether a variable has a NaN value by comparing it to itself (i.e. if then x is NaN). http://en.wikipedia.org/wiki/NaN I stand corrected. Thanks. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/math bug45712.phpt ZendEngine2 zend_operators.c
On Thu, 7 Aug 2008, Antony Dovgal wrote: On 07.08.2008 14:02, Jani Taskinen wrote: You fixed by changing the test to be wrong? :) No, I fixed the test to show the same behavior with 4.4, 5.2, 5.3 and HEAD. I also fixed comparison of NaN with empty strings and numbers. Is not $nan == $nan or $nan === $nan true ? No, they are not equal: A NaN does not compare equal to any floating-point number or NaN, even if the latter has an identical representation. One can therefore test whether a variable has a NaN value by comparing it to itself (i.e. if then x is NaN). http://en.wikipedia.org/wiki/NaN It's like NULL in SQL... regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard browscap.c
nlopess Thu Aug 7 12:50:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard browscap.c
Log:
upgrade to PCRE (i.e. get ride of ereg usage)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.85.2.2.2.3.2.6r2=1.85.2.2.2.3.2.7diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.6
php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.7
--- php-src/ext/standard/browscap.c:1.85.2.2.2.3.2.6Thu Jul 24 19:52:24 2008
+++ php-src/ext/standard/browscap.c Thu Aug 7 12:50:17 2008
@@ -16,13 +16,13 @@
+--+
*/
-/* $Id: browscap.c,v 1.85.2.2.2.3.2.6 2008/07/24 19:52:24 felipe Exp $ */
+/* $Id: browscap.c,v 1.85.2.2.2.3.2.7 2008/08/07 12:50:17 nlopess Exp $ */
#include php.h
#include php_browscap.h
#include php_ini.h
#include php_string.h
-#include ext/ereg/php_regex.h
+#include ext/pcre/php_pcre.h
#include zend_ini_scanner.h
#include zend_globals.h
@@ -51,16 +51,17 @@
static void convert_browscap_pattern(zval *pattern) /* {{{ */
{
- register int i, j;
+ int i, j=0;
char *t;
php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
- t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 3, 1);
+ t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 5, 1);
- t[0] = '^';
+ t[j++] = '§';
+ t[j++] = '^';
- for (i=0, j=1; iZ_STRLEN_P(pattern); i++, j++) {
+ for (i=0; iZ_STRLEN_P(pattern); i++, j++) {
switch (Z_STRVAL_P(pattern)[i]) {
case '?':
t[j] = '.';
@@ -73,6 +74,22 @@
t[j++] = '\\';
t[j] = '.';
break;
+ case '\\':
+ t[j++] = '\\';
+ t[j] = '\\';
+ break;
+ case '(':
+ t[j++] = '\\';
+ t[j] = '(';
+ break;
+ case ')':
+ t[j++] = '\\';
+ t[j] = ')';
+ break;
+ case '§':
+ t[j++] = '\\';
+ t[j] = '§';
+ break;
default:
t[j] = Z_STRVAL_P(pattern)[i];
break;
@@ -80,6 +97,7 @@
}
t[j++] = '$';
+ t[j++] = '§';
t[j]=0;
Z_STRVAL_P(pattern) = t;
@@ -215,8 +233,11 @@
static int browser_reg_compare(zval **browser TSRMLS_DC, int num_args, va_list
args, zend_hash_key *key) /* {{{ */
{
zval **browser_regex, **previous_match;
- regex_t r;
+ pcre *re;
+ int re_options;
+ pcre_extra *re_extra;
char *lookup_browser_name = va_arg(args, char *);
+ int lookup_browser_length = va_arg(args, int);
zval **found_browser_entry = va_arg(args, zval **);
/* See if we have an exact match, if so, we're done... */
@@ -233,10 +254,12 @@
return 0;
}
- if (regcomp(r, Z_STRVAL_PP(browser_regex), REG_NOSUB) != 0) {
+ re = pcre_get_compiled_regex(Z_STRVAL_PP(browser_regex), re_extra,
re_options TSRMLS_CC);
+ if (re == NULL) {
return 0;
}
- if (regexec(r, lookup_browser_name, 0, NULL, 0) == 0) {
+
+ if (pcre_exec(re, re_extra, lookup_browser_name, lookup_browser_length,
0, re_options, NULL, 0) == 0) {
/* If we've found a possible browser, we need to do a
comparison of the
number of characters changed in the user agent being checked
versus
the previous match found and the current match. */
@@ -245,11 +268,10 @@
zval **current_match;
if (zend_hash_find(Z_ARRVAL_PP(browser),
browser_name_pattern, sizeof(browser_name_pattern), (void**)
current_match) == FAILURE) {
- regfree(r);
return 0;
}
- ua_len = strlen(lookup_browser_name);
+ ua_len = lookup_browser_length;
for (i = 0; i Z_STRLEN_PP(previous_match); i++) {
switch (Z_STRVAL_PP(previous_match)[i]) {
@@ -286,10 +308,6 @@
}
}
- if (r) {
- regfree(r);
- }
-
return 0;
}
/* }}} */
@@ -329,7 +347,7 @@
if (zend_hash_find(browser_hash, lookup_browser_name, agent_name_len +
1, (void **) agent) == FAILURE) {
found_browser_entry = NULL;
-
[PHP-CVS] cvs: php-src /ext/standard browscap.c
nlopess Thu Aug 7 12:51:05 2008 UTC
Modified files:
/php-src/ext/standard browscap.c
Log:
MFB: upgrade to PCRE
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/browscap.c?r1=1.99r2=1.100diff_format=u
Index: php-src/ext/standard/browscap.c
diff -u php-src/ext/standard/browscap.c:1.99
php-src/ext/standard/browscap.c:1.100
--- php-src/ext/standard/browscap.c:1.99Thu Jul 24 19:50:23 2008
+++ php-src/ext/standard/browscap.c Thu Aug 7 12:51:05 2008
@@ -16,13 +16,13 @@
+--+
*/
-/* $Id: browscap.c,v 1.99 2008/07/24 19:50:23 felipe Exp $ */
+/* $Id: browscap.c,v 1.100 2008/08/07 12:51:05 nlopess Exp $ */
#include php.h
#include php_browscap.h
#include php_ini.h
#include php_string.h
-#include ext/ereg/php_regex.h
+#include ext/pcre/php_pcre.h
#include zend_ini_scanner.h
#include zend_globals.h
@@ -51,16 +51,17 @@
static void convert_browscap_pattern(zval *pattern) /* {{{ */
{
- register int i, j;
+ int i, j=0;
char *t;
php_strtolower(Z_STRVAL_P(pattern), Z_STRLEN_P(pattern));
- t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 3, 1);
+ t = (char *) safe_pemalloc(Z_STRLEN_P(pattern), 2, 5, 1);
- t[0] = '^';
+ t[j++] = '§';
+ t[j++] = '^';
- for (i=0, j=1; iZ_STRLEN_P(pattern); i++, j++) {
+ for (i=0; iZ_STRLEN_P(pattern); i++, j++) {
switch (Z_STRVAL_P(pattern)[i]) {
case '?':
t[j] = '.';
@@ -73,6 +74,22 @@
t[j++] = '\\';
t[j] = '.';
break;
+ case '\\':
+ t[j++] = '\\';
+ t[j] = '\\';
+ break;
+ case '(':
+ t[j++] = '\\';
+ t[j] = '(';
+ break;
+ case ')':
+ t[j++] = '\\';
+ t[j] = ')';
+ break;
+ case '§':
+ t[j++] = '\\';
+ t[j] = '§';
+ break;
default:
t[j] = Z_STRVAL_P(pattern)[i];
break;
@@ -80,6 +97,7 @@
}
t[j++] = '$';
+ t[j++] = '§';
t[j]=0;
Z_STRVAL_P(pattern) = t;
@@ -215,8 +233,11 @@
static int browser_reg_compare(zval **browser TSRMLS_DC, int num_args, va_list
args, zend_hash_key *key) /* {{{ */
{
zval **browser_regex, **previous_match;
- regex_t r;
+ pcre *re;
+ int re_options;
+ pcre_extra *re_extra;
char *lookup_browser_name = va_arg(args, char *);
+ int lookup_browser_length = va_arg(args, int);
zval **found_browser_entry = va_arg(args, zval **);
/* See if we have an exact match, if so, we're done... */
@@ -233,10 +254,12 @@
return 0;
}
- if (regcomp(r, Z_STRVAL_PP(browser_regex), REG_NOSUB) != 0) {
+ re = pcre_get_compiled_regex(Z_STRVAL_PP(browser_regex), re_extra,
re_options TSRMLS_CC);
+ if (re == NULL) {
return 0;
}
- if (regexec(r, lookup_browser_name, 0, NULL, 0) == 0) {
+
+ if (pcre_exec(re, re_extra, lookup_browser_name, lookup_browser_length,
0, re_options, NULL, 0) == 0) {
/* If we've found a possible browser, we need to do a
comparison of the
number of characters changed in the user agent being checked
versus
the previous match found and the current match. */
@@ -245,11 +268,10 @@
zval **current_match;
if (zend_hash_find(Z_ARRVAL_PP(browser),
browser_name_pattern, sizeof(browser_name_pattern), (void**)
current_match) == FAILURE) {
- regfree(r);
return 0;
}
- ua_len = strlen(lookup_browser_name);
+ ua_len = lookup_browser_length;
for (i = 0; i Z_STRLEN_PP(previous_match); i++) {
switch (Z_STRVAL_PP(previous_match)[i]) {
@@ -286,10 +308,6 @@
}
}
- if (r) {
- regfree(r);
- }
-
return 0;
}
/* }}} */
@@ -329,7 +347,7 @@
if (zend_hash_find(browser_hash, lookup_browser_name, agent_name_len +
1, (void **) agent) == FAILURE) {
found_browser_entry = NULL;
- zend_hash_apply_with_arguments(browser_hash TSRMLS_CC,
(apply_func_args_t) browser_reg_compare, 2, lookup_browser_name,
found_browser_entry);
+
[PHP-CVS] cvs: php-src /ext/pcntl EXPERIMENTAL
tony2001Thu Aug 7 13:07:07 2008 UTC Removed files: /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcntl EXPERIMENTAL
tony2001Thu Aug 7 13:07:16 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcntl EXPERIMENTAL
tony2001Thu Aug 7 13:07:33 2008 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pcntl config.m4
tony2001Thu Aug 7 13:10:22 2008 UTC Modified files: /php-src/ext/pcntl config.m4 Log: not experimental anymore http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.12r2=1.13diff_format=u Index: php-src/ext/pcntl/config.m4 diff -u php-src/ext/pcntl/config.m4:1.12 php-src/ext/pcntl/config.m4:1.13 --- php-src/ext/pcntl/config.m4:1.12Tue Aug 5 15:12:10 2008 +++ php-src/ext/pcntl/config.m4 Thu Aug 7 13:10:22 2008 @@ -1,12 +1,9 @@ dnl -dnl $Id: config.m4,v 1.12 2008/08/05 15:12:10 jani Exp $ +dnl $Id: config.m4,v 1.13 2008/08/07 13:10:22 tony2001 Exp $ dnl -dnl Process Control (pcntl) extentsion --EXPERIMENTAL-- -dnl TODO - Add platform checks - PHP_ARG_ENABLE(pcntl, whether to enable pcntl support, -[ --enable-pcntl Enable experimental pcntl support (CLI/CGI only)]) +[ --enable-pcntl Enable pcntl support (CLI/CGI only)]) if test $PHP_PCNTL != no; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcntl config.m4
tony2001Thu Aug 7 13:11:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pcntl config.m4 Log: not experimental anymore http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.10.8.2r2=1.10.8.3diff_format=u Index: php-src/ext/pcntl/config.m4 diff -u php-src/ext/pcntl/config.m4:1.10.8.2 php-src/ext/pcntl/config.m4:1.10.8.3 --- php-src/ext/pcntl/config.m4:1.10.8.2Tue Aug 5 15:12:19 2008 +++ php-src/ext/pcntl/config.m4 Thu Aug 7 13:11:05 2008 @@ -1,12 +1,9 @@ dnl -dnl $Id: config.m4,v 1.10.8.2 2008/08/05 15:12:19 jani Exp $ +dnl $Id: config.m4,v 1.10.8.3 2008/08/07 13:11:05 tony2001 Exp $ dnl -dnl Process Control (pcntl) extentsion --EXPERIMENTAL-- -dnl TODO - Add platform checks - PHP_ARG_ENABLE(pcntl, whether to enable pcntl support, -[ --enable-pcntl Enable experimental pcntl support (CLI/CGI only)]) +[ --enable-pcntl Enable pcntl support (CLI/CGI only)]) if test $PHP_PCNTL != no; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pcntl config.m4
tony2001Thu Aug 7 13:11:29 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcntl config.m4 Log: not experimental anymore http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/config.m4?r1=1.10r2=1.10.6.1diff_format=u Index: php-src/ext/pcntl/config.m4 diff -u php-src/ext/pcntl/config.m4:1.10 php-src/ext/pcntl/config.m4:1.10.6.1 --- php-src/ext/pcntl/config.m4:1.10Tue Oct 28 17:08:18 2003 +++ php-src/ext/pcntl/config.m4 Thu Aug 7 13:11:28 2008 @@ -1,12 +1,9 @@ dnl -dnl $Id: config.m4,v 1.10 2003/10/28 17:08:18 gschlossnagle Exp $ +dnl $Id: config.m4,v 1.10.6.1 2008/08/07 13:11:28 tony2001 Exp $ dnl -dnl Process Control (pcntl) extentsion --EXPERIMENTAL-- -dnl TODO - Add platform checks - PHP_ARG_ENABLE(pcntl, whether to enable pcntl support, -[ --enable-pcntl Enable experimental pcntl support (CLI/CGI only)]) +[ --enable-pcntl Enable pcntl support (CLI/CGI only)]) if test $PHP_PCNTL != no; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
johannesThu Aug 7 14:39:33 2008 UTC Modified files: /php-srcEXTENSIONS Log: Update EXTENSIONS file http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.83r2=1.84diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.83 php-src/EXTENSIONS:1.84 --- php-src/EXTENSIONS:1.83 Mon Jul 7 17:59:52 2008 +++ php-src/EXTENSIONS Thu Aug 7 14:39:33 2008 @@ -77,6 +77,11 @@ MAINTENANCE: Unknown STATUS: Working --- +EXTENSION: litespeed +MAINTENANCE: George Wang [EMAIL PROTECTED] +STATUS: Working +SINCE: 5.3 +--- EXTENSION: milter MAINTENANCE: Unknown STATUS: Unknown @@ -234,11 +239,18 @@ MAINTENANCE: Maintained STATUS: Working SINCE: 5.0 (Since 4.3.2 in PECL) -COMMENT: Integrates SQLite embeddable SQL database engine. +COMMENT: Integrates SQLite 2 embeddable SQL database engine. +--- +EXTENSION: sqlite3 +PRIMARY MAINTAINER: Scott MacVicar [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +COMMENT: Integrates SQLite 3 embeddable SQL database engine. --- EXTENSION: sybase_ct -PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] -MAINTENANCE:Maintained +PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working --- @@ -347,6 +359,12 @@ STATUS: Working SINCE: 4.2 --- +EXTENSION: fileinfo +PRIMARY MAINTAINER: Derick Rethans [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +--- EXTENSION: filter PRIMARY MAINTAINER: Derick Rethans [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED], Ilia Alshanetsky [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -413,7 +431,7 @@ PRIMARY MAINTAINER: Unknown MAINTENANCE: Deprecated STATUS: Experimental -COMMENT: Use PECL's fileinfo extension instead +COMMENT: Use the fileinfo extension instead --- EXTENSION: ming PRIMARY MAINTAINER: Frank M. Kromann @@ -439,6 +457,7 @@ PRIMARY MAINTAINER: Greg Beaver [EMAIL PROTECTED], Marcus Börger [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working +SINCE: 5.3 --- EXTENSION: posix PRIMARY MAINTAINER: Kristian Köhntopp [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / EXTENSIONS
johannesThu Aug 7 14:39:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: MFH: Update EXTENSIONS file http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.8r2=1.72.2.4.2.4.2.9diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.8 php-src/EXTENSIONS:1.72.2.4.2.4.2.9 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.8 Mon Jul 14 19:32:52 2008 +++ php-src/EXTENSIONS Thu Aug 7 14:39:47 2008 @@ -77,6 +77,11 @@ MAINTENANCE: Unknown STATUS: Working --- +EXTENSION: litespeed +MAINTENANCE: George Wang [EMAIL PROTECTED] +STATUS: Working +SINCE: 5.3 +--- EXTENSION: milter MAINTENANCE: Unknown STATUS: Unknown @@ -234,11 +239,18 @@ MAINTENANCE: Maintained STATUS: Working SINCE: 5.0 (Since 4.3.2 in PECL) -COMMENT: Integrates SQLite embeddable SQL database engine. +COMMENT: Integrates SQLite 2 embeddable SQL database engine. +--- +EXTENSION: sqlite3 +PRIMARY MAINTAINER: Scott MacVicar [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +COMMENT: Integrates SQLite 3 embeddable SQL database engine. --- EXTENSION: sybase_ct -PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] -MAINTENANCE:Maintained +PRIMARY MAINTAINER: Timm Friebe [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working --- @@ -347,6 +359,12 @@ STATUS: Working SINCE: 4.2 --- +EXTENSION: fileinfo +PRIMARY MAINTAINER: Derick Rethans [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +SINCE: 5.3 +--- EXTENSION: filter PRIMARY MAINTAINER: Derick Rethans [EMAIL PROTECTED], Pierre-Alain Joye [EMAIL PROTECTED], Ilia Alshanetsky [EMAIL PROTECTED] MAINTENANCE: Maintained @@ -419,7 +437,7 @@ PRIMARY MAINTAINER: Unknown MAINTENANCE: Deprecated STATUS: Experimental -COMMENT: Use PECL's fileinfo extension instead +COMMENT: Use the fileinfo extension instead --- EXTENSION: ming PRIMARY MAINTAINER: Frank M. Kromann @@ -445,6 +463,7 @@ PRIMARY MAINTAINER: Greg Beaver [EMAIL PROTECTED], Marcus Börger [EMAIL PROTECTED] MAINTENANCE: Maintained STATUS: Working +SINCE: 5.3 --- EXTENSION: posix PRIMARY MAINTAINER: Kristian Köhntopp [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
johannesThu Aug 7 14:46:14 2008 UTC Modified files: /php-srcEXTENSIONS Log: fix (thx Christian Hoffmann) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.84r2=1.85diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.84 php-src/EXTENSIONS:1.85 --- php-src/EXTENSIONS:1.84 Thu Aug 7 14:39:33 2008 +++ php-src/EXTENSIONS Thu Aug 7 14:46:13 2008 @@ -78,7 +78,8 @@ STATUS: Working --- EXTENSION: litespeed -MAINTENANCE: George Wang [EMAIL PROTECTED] +PRIMARY MAINTAINER: George Wang [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working SINCE: 5.3 --- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / EXTENSIONS
johannesThu Aug 7 14:46:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: MFH: fix (thx Christian Hoffmann) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.9r2=1.72.2.4.2.4.2.10diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.9 php-src/EXTENSIONS:1.72.2.4.2.4.2.10 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.9 Thu Aug 7 14:39:47 2008 +++ php-src/EXTENSIONS Thu Aug 7 14:46:49 2008 @@ -78,7 +78,8 @@ STATUS: Working --- EXTENSION: litespeed -MAINTENANCE: George Wang [EMAIL PROTECTED] +PRIMARY MAINTAINER: George Wang [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working SINCE: 5.3 --- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src /ext/pcntl EXPERIMENTAL
Hi, On Thu, 2008-08-07 at 13:07 +, Antony Dovgal wrote: tony2001 Thu Aug 7 13:07:07 2008 UTC Removed files: /php-src/ext/pcntlEXPERIMENTAL Log: remove EXPERIMENTAL flag The EXTENSIONS file says EXTENSION: pcntl MAINTENANCE: Unknown STATUS: Working Now that we're removing the EXPERIMENTAL flag: Anybody who wants to step in? johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: cvs: php-src /ext/pcntl EXPERIMENTAL
Hi, On Thursday 07 August 2008 16:48:30 Johannes Schlüter wrote: Hi, On Thu, 2008-08-07 at 13:07 +, Antony Dovgal wrote: tony2001Thu Aug 7 13:07:07 2008 UTC Removed files: /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag The EXTENSIONS file says EXTENSION: pcntl MAINTENANCE: Unknown STATUS: Working Now that we're removing the EXPERIMENTAL flag: Anybody who wants to step in? johannes If you mean that a maintainer is needed for pcntl, I'm interested in maintaining it :) Regards, Arnaud -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] Re: cvs: php-src /ext/pcntl EXPERIMENTAL
On 07.08.2008, at 16:59, Arnaud Le Blanc wrote: Hi, On Thursday 07 August 2008 16:48:30 Johannes Schlüter wrote: Hi, On Thu, 2008-08-07 at 13:07 +, Antony Dovgal wrote: tony2001Thu Aug 7 13:07:07 2008 UTC Removed files: /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag The EXTENSIONS file says EXTENSION: pcntl MAINTENANCE: Unknown STATUS: Working Now that we're removing the EXPERIMENTAL flag: Anybody who wants to step in? johannes If you mean that a maintainer is needed for pcntl, I'm interested in maintaining it :) I was just going to propose you :) regards, Lukas Kahwe Smith [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] Re: cvs: php-src /ext/pcntl EXPERIMENTAL
On Thursday 07 August 2008 17:01:52 Lukas Kahwe Smith wrote: On 07.08.2008, at 16:59, Arnaud Le Blanc wrote: Hi, On Thursday 07 August 2008 16:48:30 Johannes Schlüter wrote: Hi, On Thu, 2008-08-07 at 13:07 +, Antony Dovgal wrote: tony2001 Thu Aug 7 13:07:07 2008 UTC Removed files: /php-src/ext/pcntl EXPERIMENTAL Log: remove EXPERIMENTAL flag The EXTENSIONS file says EXTENSION: pcntl MAINTENANCE: Unknown STATUS: Working Now that we're removing the EXPERIMENTAL flag: Anybody who wants to step in? johannes If you mean that a maintainer is needed for pcntl, I'm interested in maintaining it :) I was just going to propose you :) regards, Lukas Kahwe Smith [EMAIL PROTECTED] So, I accept :) Regards, Arnaud -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
lbarnaudThu Aug 7 15:29:24 2008 UTC Modified files: /php-srcEXTENSIONS Log: New maintainer :) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.85r2=1.86diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.85 php-src/EXTENSIONS:1.86 --- php-src/EXTENSIONS:1.85 Thu Aug 7 14:46:13 2008 +++ php-src/EXTENSIONS Thu Aug 7 15:29:24 2008 @@ -446,7 +446,8 @@ SINCE: 4.0.4 --- EXTENSION: pcntl -MAINTENANCE: Unknown +PRIMARY MAINTAINER: Arnaud Le Blanc [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working --- EXTENSION: pcre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / EXTENSIONS
lbarnaudThu Aug 7 15:29:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: MFH: New maintainer :) http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.10r2=1.72.2.4.2.4.2.11diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.10 php-src/EXTENSIONS:1.72.2.4.2.4.2.11 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.10Thu Aug 7 14:46:49 2008 +++ php-src/EXTENSIONS Thu Aug 7 15:29:38 2008 @@ -452,7 +452,8 @@ SINCE: 4.0.4 --- EXTENSION: pcntl -MAINTENANCE: Unknown +PRIMARY MAINTAINER: Arnaud Le Blanc [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working --- EXTENSION: pcre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed config.m4
gwang Thu Aug 7 16:41:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/litespeed config.m4 Log: use PHP_ARG_WITH instead of AC_ARG_WITH http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/config.m4?r1=1.2.2.2r2=1.2.2.3diff_format=u -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-internals-win /script conf_tools.bat snap_delete_old.sh snapshot.bat snapshot_5_3.bat
pajoye Thu Aug 7 17:04:33 2008 UTC
Added files:
/php-internals-win/script snap_delete_old.sh snapshot.bat
conf_tools.bat snapshot_5_3.bat
Log:
- new snap script (adieu cygwin)
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snap_delete_old.sh?view=markuprev=1.1
Index: php-internals-win/script/snap_delete_old.sh
+++ php-internals-win/script/snap_delete_old.sh
SSH_DIR=/local/sites/snaps.php.net/www/win32
cd $SSH_DIR
for i in php$VER-win32-2*.zip php$VER-dbgpack-win32-2*.zip
pecl$VER-win32-2*.zip php$VER-win32-installer-2*.msi; do
list=`ls -r $i 2/dev/null`
cmd=cd $SSH_DIR
count=0
for j in $list; do
let count=count+1
if [ $count -gt 5 ]; then
cmd=rm -f $j
fi
done
done
http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?view=markuprev=1.1
Index: php-internals-win/script/snapshot.bat
+++ php-internals-win/script/snapshot.bat
@ECHO off
REM Configuration
CALL %PHP_SDK_PATH%\script\conf_tools.bat
SET START=%CD%
IF %1== GOTO HELP
IF %2== GOTO HELP
IF %3== GOTO HELP
SET VC=%1
SET BRANCH=%2
SET DEST=%3
SET CUR_PATH=%PATH%
for /F tokens=1-4 delims=:., %%a in ('time/T') do set _TIME=%%a%%b%%c
for /F tokens=2-5 delims=:.,/ %%a in ('date/T') do set _DATE=%%a%%b%%c
SET SNAPDATETIME=%_DATE%%_TIME%
IF EXIST %3 rmdir /s /q %3
IF %VC%==6 GOTO CONFIG_VC6
IF %VC%==9 GOTO CONFIG_VC9
echo Invalid VC Version
GOTO EXIT
:CONFIG_VC6
SET INCLUDE=%VC6_INCLUDE%
SET LIB=%VC6_LIB%
SET PATH=%VC6_PATH%;%PATH%
GOTO CVS
:CONFIG_VC9
SET INCLUDE=%VC9_INCLUDE%
SET LIB=%VC9_LIB%
SET PATH=%VC9_PATH%;%PATH%
:CVS
cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d
%DEST% php5 %START%\cvs.log 21
IF EXIST %DEST% GOTO DEST_EXISTS
ECHO CVS ERROR
GOTO EXIT
:DEST_EXISTS
cd %DEST%
call buildconf.bat %START%\buildconf.log 21
call configure.bat --enable-snapshot-build --enable-debug-pack
--disable-fileinfo --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared
--with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared
%START%\compile.log 21
nmake snap %START%\compile.log 21
:TRANSFERT
FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo
substr(phpversion(),0,3);') DO SET _PHPVERSION_SHORT=%%A
FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo phpversion();') DO SET
_PHPVERSION_STRING=%%A
FOR /F tokens=* %%A IN ('Release_TS\\php.exe -r echo date('YmdGi');') DO
SET SNAPDATETIME=%%A
SET PHP_ZIP_FILE=Release_TS\php-%_PHPVERSION_STRING%-Win32.zip
copy %PHP_ZIP_FILE% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
SET PHPDEBUG_ZIP_FILE=Release_TS\php-debug-pack-%_PHPVERSION_STRING%-Win32.zip
copy %PHP_ZIP_FILE%
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip
REM Using -i now
REM %PUTTYBASE%pageant.exe %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
%PUTTYBASE%plink.exe -batch -l %REMOTE_USER% -m
%PHP_SDK_PATH%script\snap_delete_old.sh snaps.php.net
%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER%
%START%\php%_PHPVERSION_SHORT%-dbgpack-win32-%SNAPDATETIME%.zip
%SSH_URL%:%REMOTE_PATH%
%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\php%_PHPVERSION_SHORT%-win32-%SNAPDATETIME%.zip
%SSH_URL%:%REMOTE_PATH%
%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\compile.log
%SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log
%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\cvs.log
%SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log
%PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk
-l %REMOTE_USER% %START%\buildconf.log
%SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log
GOTO EXIT
:HELP
ECHO snapshot ^VC version^ ^branch/tag^ ^destination^
:EXIT
cd %START%
http://cvs.php.net/viewvc.cgi/php-internals-win/script/conf_tools.bat?view=markuprev=1.1
Index: php-internals-win/script/conf_tools.bat
+++ php-internals-win/script/conf_tools.bat
@ECHO OFF
SET VC6_INCLUDE=C:\Program Files (x86)\Microsoft
SDK\Include;C:\PROGRA~2\MICROS~2\VC98\ATL\INCLUDE;C:\PROGRA~2\MICROS~2\VC98\INCLUDE;C:\PROGRA~2\MICROS~2\VC98\MFC\INCLUDE
SET VC6_LIB=C:\Program Files (x86)\Microsoft
SDK\Lib;C:\PROGRA~2\MICROS~2\VC98\LIB;C:\PROGRA~2\MICROS~2\VC98\MFC\LIB
SET VC6_PATH=c:\Program Files (x86)\Microsoft SDK\Bin;c:\Program Files
(x86)\Microsoft
SDK\Bin\WinNT;c:\PROGRA~2\MICROS~2\Common\msdev98\BIN;c:\PROGRA~2\MICROS~2\VC98\BIN;c:\PROGRA~2\MICROS~2\Common\TOOLS\WINNT;c:\PROGRA~2\MICROS~2\Common/TOOLS
SET VC9_INCLUDE=C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\ATLMFC\INCLUDE;C:\Program Files (x86)\Microsoft Visual Studio
9.0\VC\INCLUDE;C:\Program Files\\Microsoft
SDKs\Windows\v6.0A\include;C:\Program Files (x86)\Microsoft Visual Studio .NET
[PHP-CVS] cvs: php-internals-win /script snapshot.bat
pajoye Thu Aug 7 17:18:13 2008 UTC Modified files: /php-internals-win/script snapshot.bat Log: add lock http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.1r2=1.2diff_format=u Index: php-internals-win/script/snapshot.bat diff -u php-internals-win/script/snapshot.bat:1.1 php-internals-win/script/snapshot.bat:1.2 --- php-internals-win/script/snapshot.bat:1.1 Thu Aug 7 17:04:33 2008 +++ php-internals-win/script/snapshot.bat Thu Aug 7 17:18:12 2008 @@ -1,9 +1,12 @@ @ECHO off REM Configuration CALL %PHP_SDK_PATH%\script\conf_tools.bat +IF EXIST %PHP_SDK_PATH%\snaps.lock +echo Snapshot script is running, aborted. +GOTO EXIT SET START=%CD% - +echo LOCKED %PHP_SDK_PATH%\snaps.lock IF %1== GOTO HELP IF %2== GOTO HELP IF %3== GOTO HELP @@ -70,7 +73,7 @@ %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\compile.log %SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\cvs.log %SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log - +delete %PHP_SDK_PATH%\snaps.lock GOTO EXIT :HELP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs WixUI_en-us.wxl
jmertic Thu Aug 7 17:34:55 2008 UTC Modified files: /win-installer ExtensionsFeatures53.wxs WixUI_en-us.wxl Log: Added placeholders for oci8_11g extension. Default enable certain php extensions, such as bz2, curl, exif, gd2, gettext, gmp, imap, mcrypt, mhash, mysql, mysqli, mssql, openssl, pdo_mysql, pdo_odbc, pdo_sqlite, pgsql, pspell, soap, sockets, sqlite3, tidy, xmlrpc, and zip. http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.2r2=1.3diff_format=u Index: win-installer/ExtensionsFeatures53.wxs diff -u win-installer/ExtensionsFeatures53.wxs:1.2 win-installer/ExtensionsFeatures53.wxs:1.3 --- win-installer/ExtensionsFeatures53.wxs:1.2 Mon Aug 4 15:11:38 2008 +++ win-installer/ExtensionsFeatures53.wxs Thu Aug 7 17:34:55 2008 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=windows-1252? Wix xmlns=http://schemas.microsoft.com/wix/2003/01/wi; Fragment Id=FragmentExtensionsFeatures - Feature AllowAdvertise=no Id=Extensions Title=$(loc.FeatureExtensionsTitle) Description=$(loc.FeatureExtensionsDescription) Level=10 + Feature AllowAdvertise=no Id=Extensions Title=$(loc.FeatureExtensionsTitle) Description=$(loc.FeatureExtensionsDescription) TypicalDefault=install Level=1 ComponentRef Id=extdir/ Feature AllowAdvertise=no Id=pecl_php5activescript Title=$(loc.Featurepecl_phpactivescriptTitle) Description=$(loc.Featurepecl_phpactivescriptDescription) Level=10 ComponentRef Id=php5activescript/ @@ -30,7 +30,7 @@ Feature AllowAdvertise=no Id=ext_php_blenc Title=$(loc.Featureext_php_blencTitle) Description=$(loc.Featureext_php_blencDescription) Level=10 ComponentRef Id=php_blenc/ /Feature - Feature AllowAdvertise=no Id=ext_php_bz2 Title=$(loc.Featureext_php_bz2Title) Description=$(loc.Featureext_php_bz2Description) Level=10 + Feature AllowAdvertise=no Id=ext_php_bz2 Title=$(loc.Featureext_php_bz2Title) Description=$(loc.Featureext_php_bz2Description) TypicalDefault=install Level=1 ComponentRef Id=php_bz2/ /Feature Feature AllowAdvertise=no Id=ext_php_bz2_filter Title=$(loc.Featureext_php_bz2_filterTitle) Description=$(loc.Featureext_php_bz2_filterDescription) Level=10 @@ -48,7 +48,7 @@ Feature AllowAdvertise=no Id=ext_php_cvsclient Title=$(loc.Featureext_php_cvsclientTitle) Description=$(loc.Featureext_php_cvsclientDescription) Level=10 ComponentRef Id=php_cvsclient/ /Feature - Feature AllowAdvertise=no Id=ext_php_curl Title=$(loc.Featureext_php_curlTitle) Description=$(loc.Featureext_php_curlDescription) Level=10 + Feature AllowAdvertise=no Id=ext_php_curl Title=$(loc.Featureext_php_curlTitle) Description=$(loc.Featureext_php_curlDescription) TypicalDefault=install Level=1 ComponentRef Id=php_curl/ ComponentRef Id=libeay32DLL/ ComponentRef Id=ssleay32DLL/ @@ -80,7 +80,7 @@ Feature AllowAdvertise=no Id=ext_php_event Title=$(loc.Featureext_php_eventTitle) Description=$(loc.Featureext_php_eventDescription) Level=10 ComponentRef Id=php_event/ /Feature - Feature AllowAdvertise=no Id=ext_php_exif Title=$(loc.Featureext_php_exifTitle) Description=$(loc.Featureext_php_exifDescription) Level=10 + Feature AllowAdvertise=no Id=ext_php_exif Title=$(loc.Featureext_php_exifTitle) Description=$(loc.Featureext_php_exifDescription) TypicalDefault=install Level=1 ComponentRef Id=php_mbstring/ ComponentRef Id=php_exif/ /Feature @@ -102,13 +102,13 @@ ComponentRef Id=php_fribidi/ ComponentRef Id=fribidiDLL/ /Feature - Feature AllowAdvertise=no Id=ext_php_gd2 Title=$(loc.Featureext_php_gd2Title) Description=$(loc.Featureext_php_gd2Description) Level=10 + Feature AllowAdvertise=no Id=ext_php_gd2 Title=$(loc.Featureext_php_gd2Title) Description=$(loc.Featureext_php_gd2Description) TypicalDefault=install Level=1 ComponentRef Id=php_gd2/ /Feature - Feature AllowAdvertise=no Id=ext_php_gettext Title=$(loc.Featureext_php_gettextTitle) Description=$(loc.Featureext_php_gettextDescription) Level=10 + Feature AllowAdvertise=no Id=ext_php_gettext
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed config.m4
nlopess Thu Aug 7 19:32:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/litespeed config.m4 Log: fix this, so that I can build php without litespeed.. http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/config.m4?r1=1.2.2.3r2=1.2.2.4diff_format=u Index: php-src/sapi/litespeed/config.m4 diff -u php-src/sapi/litespeed/config.m4:1.2.2.3 php-src/sapi/litespeed/config.m4:1.2.2.4 --- php-src/sapi/litespeed/config.m4:1.2.2.3Thu Aug 7 16:41:30 2008 +++ php-src/sapi/litespeed/config.m4Thu Aug 7 19:32:15 2008 @@ -1,18 +1,13 @@ dnl -dnl $Id: config.m4,v 1.2.2.3 2008/08/07 16:41:30 gwang Exp $ +dnl $Id: config.m4,v 1.2.2.4 2008/08/07 19:32:15 nlopess Exp $ dnl AC_MSG_CHECKING(for LiteSpeed support) -PHP_ARG_WITH(litespeed, -[ --with-litespeedBuild PHP as litespeed module], -[ - PHP_SAPI_LITESPEED=$withval -],[ - PHP_SAPI_LITESPEED=no -]) +PHP_ARG_WITH(litespeed,, +[ --with-litespeedBuild PHP as litespeed module], no) -if test $PHP_SAPI_LITESPEED != no; then +if test $PHP_LITESPEED != no; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed) SAPI_LITESPEED_PATH=sapi/litespeed/php PHP_SUBST(SAPI_LITESPEED_PATH) @@ -33,4 +28,4 @@ PHP_SUBST(BUILD_LITESPEED) fi -AC_MSG_RESULT($PHP_SAPI_LITESPEED) +AC_MSG_RESULT($PHP_LITESPEED) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/litespeed config.m4
nlopess Thu Aug 7 19:32:48 2008 UTC Modified files: /php-src/sapi/litespeed config.m4 Log: MFB: fix build http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/config.m4?r1=1.3r2=1.4diff_format=u Index: php-src/sapi/litespeed/config.m4 diff -u php-src/sapi/litespeed/config.m4:1.3 php-src/sapi/litespeed/config.m4:1.4 --- php-src/sapi/litespeed/config.m4:1.3Thu Aug 7 16:41:30 2008 +++ php-src/sapi/litespeed/config.m4Thu Aug 7 19:32:48 2008 @@ -1,18 +1,13 @@ dnl -dnl $Id: config.m4,v 1.3 2008/08/07 16:41:30 gwang Exp $ +dnl $Id: config.m4,v 1.4 2008/08/07 19:32:48 nlopess Exp $ dnl AC_MSG_CHECKING(for LiteSpeed support) -PHP_ARG_WITH(litespeed, -[ --with-litespeedBuild PHP as litespeed module], -[ - PHP_SAPI_LITESPEED=$withval -],[ - PHP_SAPI_LITESPEED=no -]) +PHP_ARG_WITH(litespeed,, +[ --with-litespeedBuild PHP as litespeed module], no) -if test $PHP_SAPI_LITESPEED != no; then +if test $PHP_LITESPEED != no; then PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/litespeed/Makefile.frag,$abs_srcdir/sapi/litespeed,sapi/litespeed) SAPI_LITESPEED_PATH=sapi/litespeed/php PHP_SUBST(SAPI_LITESPEED_PATH) @@ -33,4 +28,4 @@ PHP_SUBST(BUILD_LITESPEED) fi -AC_MSG_RESULT($PHP_SAPI_LITESPEED) +AC_MSG_RESULT($PHP_LITESPEED) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-internals-win /script snapshot.bat
pajoye Thu Aug 7 20:16:01 2008 UTC Modified files: /php-internals-win/script snapshot.bat Log: - pdo_oic8 and fix unlock snapshot.bat http://cvs.php.net/viewvc.cgi/php-internals-win/script/snapshot.bat?r1=1.2r2=1.3diff_format=u Index: php-internals-win/script/snapshot.bat diff -u php-internals-win/script/snapshot.bat:1.2 php-internals-win/script/snapshot.bat:1.3 --- php-internals-win/script/snapshot.bat:1.2 Thu Aug 7 17:18:12 2008 +++ php-internals-win/script/snapshot.bat Thu Aug 7 20:16:01 2008 @@ -1,9 +1,9 @@ @ECHO off REM Configuration CALL %PHP_SDK_PATH%\script\conf_tools.bat -IF EXIST %PHP_SDK_PATH%\snaps.lock -echo Snapshot script is running, aborted. -GOTO EXIT + + +IF EXIST %PHP_SDK_PATH%\snaps.lock ECHO Snapshot script is already running GOTO EXIT SET START=%CD% echo LOCKED %PHP_SDK_PATH%\snaps.lock @@ -41,8 +41,8 @@ :CVS cvs -d :pserver:[EMAIL PROTECTED]:/repository -z3 checkout -r %BRANCH% -d %DEST% php5 %START%\cvs.log 21 - -IF EXIST %DEST% GOTO DEST_EXISTS +echo Testing %DEST%... +IF EXIST %DEST% GOTO DEST_EXISTS ECHO CVS ERROR GOTO EXIT :DEST_EXISTS @@ -50,7 +50,7 @@ cd %DEST% call buildconf.bat %START%\buildconf.log 21 -call configure.bat --enable-snapshot-build --enable-debug-pack --disable-fileinfo --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared %START%\compile.log 21 +call configure.bat --enable-snapshot-build --enable-debug-pack --disable-fileinfo --with-pdo-oci=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8=C:\php-sdk\oracle\instantclient10\sdk,shared --with-oci8-11g=C:\php-sdk\oracle\instantclient11\sdk,shared %START%\compile.log 21 nmake snap %START%\compile.log 21 @@ -73,7 +73,7 @@ %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\compile.log %SSH_URL%:%REMOTE_PATH%/compile-%_PHPVERSION_SHORT%.log %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\cvs.log %SSH_URL%:%REMOTE_PATH%/cvs-%_PHPVERSION_SHORT%.log %PUTTYBASE%pscp.exe -batch -i %PHP_SDK_PATH%keys\pierre_droppederon_prv.ppk -l %REMOTE_USER% %START%\buildconf.log %SSH_URL%:%REMOTE_PATH%/buildconf-%_PHPVERSION_SHORT%.log -delete %PHP_SDK_PATH%\snaps.lock +del %PHP_SDK_PATH%\snaps.lock GOTO EXIT :HELP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/filters stream_filter_remove_basic.phpt stream_filter_remove_error.phpt
felixdv Thu Aug 7 22:31:10 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filters stream_filter_remove_basic.phpt stream_filter_remove_error.phpt Log: Basic and error tests for stream_filter_remove() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt +++ php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt +++ php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/filters stream_filter_remove_basic.phpt stream_filter_remove_error.phpt
felixdv Thu Aug 7 22:32:43 2008 UTC Modified files: /php-src/ext/standard/tests/filters stream_filter_remove_basic.phpt stream_filter_remove_error.phpt Log: MFB: Basic and error tests for stream_filter_remove(). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt diff -u /dev/null php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt:1.2 --- /dev/null Thu Aug 7 22:32:43 2008 +++ php-src/ext/standard/tests/filters/stream_filter_remove_basic.phpt Thu Aug 7 22:32:43 2008 @@ -0,0 +1,48 @@ +--TEST-- +Test stream_filter_remove() function : basic functionality +--SKIPIF-- +?php +$filters = stream_get_filters(); +if(! in_array( string.rot13, $filters )) die( skip rot13 filter not available. ); +? +--FILE-- +?php +/* Prototype : bool stream_filter_remove(resource stream_filter) + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Source code: ext/standard/streamsfuncs.c + * Alias to functions: + */ + +echo *** Testing stream_filter_remove() : basic functionality ***\n; + +$file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; +touch( $file ); + +$fp = fopen( $file, 'w+' ); +stream_encoding( $fp, 'unicode' ); + +$filter = stream_filter_append( $fp, string.rot13, STREAM_FILTER_WRITE ); +fwrite( $fp, Testing the rot13 filter which shifts some things around. ); + +var_dump( stream_filter_remove( $filter ) ); +fwrite( $fp, \nadd some more un-filtered foobar\n ); + +rewind( $fp ); +fpassthru( $fp ); +fclose( $fp ); + +? +===DONE=== +--CLEAN-- +?php + +$file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; +unlink( $file ); + +? +--EXPECTF-- +*** Testing stream_filter_remove() : basic functionality *** +bool(true) +Grfgvat gur ebg13 svygre juvpu fuvsgf fbzr guvatf nebhaq. +add some more un-filtered foobar +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt diff -u /dev/null php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt:1.2 --- /dev/null Thu Aug 7 22:32:43 2008 +++ php-src/ext/standard/tests/filters/stream_filter_remove_error.phpt Thu Aug 7 22:32:43 2008 @@ -0,0 +1,80 @@ +--TEST-- +Test stream_filter_remove() function : error conditions +--SKIPIF-- +?php +$filters = stream_get_filters(); +if(! in_array( string.rot13, $filters )) die( skip rot13 filter not available. ); +? +--FILE-- +?php +/* Prototype : bool stream_filter_remove(resource stream_filter) + * Description: Flushes any data in the filter's internal buffer, removes it from the chain, and frees the resource + * Source code: ext/standard/streamsfuncs.c + * Alias to functions: + */ + +$file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; +touch( $file ); +$fp = fopen( $file, 'w+' ); +$filter = stream_filter_append( $fp, string.rot13, STREAM_FILTER_WRITE ); + +echo *** Testing stream_filter_remove() : error conditions ***\n; + +echo \n-- Testing stream_filter_remove() function with Zero arguments --\n; +var_dump( stream_filter_remove() ); + +echo \n-- Testing stream_filter_remove() function with more than expected no. of arguments --\n; +$arg = 'bogus arg'; +var_dump( stream_filter_remove( $filter, $arg ) ); + +echo \n-- Testing stream_filter_remove() function with unexisting stream filter --\n; +var_dump( stream_filter_remove( fakefilter ) ); + +echo \n-- Testing stream_filter_remove() function with bad resource --\n; +var_dump( stream_filter_remove( $fp ) ); + +echo \n-- Testing stream_filter_remove() function with an already removed filter --\n; +// Double remove it +var_dump( stream_filter_remove( $filter ) ); +var_dump( stream_filter_remove( $filter ) ); + +fclose( $fp ); + +? +===DONE=== +--CLEAN-- +?php + +$file = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'streamfilterTest.txt'; +unlink( $file ); + +? +--EXPECTF-- +*** Testing stream_filter_remove() : error conditions *** + +-- Testing stream_filter_remove() function with Zero arguments -- + +Warning: stream_filter_remove() expects exactly 1 parameter, 0 given in %s on line %d +bool(false) + +-- Testing stream_filter_remove() function with more than expected no. of arguments -- + +Warning: stream_filter_remove() expects exactly 1 parameter, 2 given in %s on line %d +bool(false) + +-- Testing stream_filter_remove() function with unexisting stream filter -- + +Warning: stream_filter_remove() expects parameter 1 to be resource, Unicode string given in %s on line %d +bool(false) + +-- Testing stream_filter_remove() function with bad resource -- + +Warning: stream_filter_remove(): Invalid resource given, not a stream filter in %s on line
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip config.w32 /ext/zip/lib .cvsignore zip.h zip_close.c zip_dirent.c zip_err_str.c zip_filerange_crc.c zip_get_archive_flag.c zip_open.c zip_rename.c zip_set_arc
pajoye Thu Aug 7 23:24:11 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/zip/libzip_filerange_crc.c zip_get_archive_flag.c
zip_set_archive_flag.c
Modified files:
/php-src/ext/zipconfig.w32
/php-src/ext/zip/lib.cvsignore zip.h zip_close.c zip_dirent.c
zip_err_str.c zip_open.c zip_rename.c
zip_source_file.c zip_source_filep.c
zip_source_zip.c zip_unchange_archive.c
zipint.h
Log:
- MFH: update to 0.9 (torrentzip support, files open only when necessary),
windows fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.1.2.1.2.5r2=1.1.2.1.2.6diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.1.2.1.2.5
php-src/ext/zip/config.w32:1.1.2.1.2.6
--- php-src/ext/zip/config.w32:1.1.2.1.2.5 Wed Jul 9 16:09:35 2008
+++ php-src/ext/zip/config.w32 Thu Aug 7 23:24:11 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1.2.1.2.5 2008/07/09 16:09:35 rrichards Exp $
+// $Id: config.w32,v 1.1.2.1.2.6 2008/08/07 23:24:11 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE(zip, ZIP support, yes);
@@ -17,7 +17,8 @@
zip_error_get_sys_type.c zip_file_get_offset.c \
zip_get_name.c zip_replace.c zip_source_function.c \
zip_unchange.c zip_dirent.c zip_error_strerror.c \
- zip_file_strerror.c zip_get_num_files.c \
+ zip_filerange_crc.c zip_file_strerror.c
zip_get_num_files.c \
+ zip_get_archive_flag.c zip_set_archive_flag.c \
zip_set_name.c zip_source_zip.c zip_unchange_data.c \
zip_entry_free.c zip_error_to_str.c zip_fopen.c \
zip_name_locate.c zip_source_buffer.c zip_stat.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/.cvsignore?r1=1.1.2.4r2=1.1.2.4.2.1diff_format=u
Index: php-src/ext/zip/lib/.cvsignore
diff -u php-src/ext/zip/lib/.cvsignore:1.1.2.4
php-src/ext/zip/lib/.cvsignore:1.1.2.4.2.1
--- php-src/ext/zip/lib/.cvsignore:1.1.2.4 Tue Feb 13 10:07:39 2007
+++ php-src/ext/zip/lib/.cvsignore Thu Aug 7 23:24:11 2008
@@ -1,4 +1,3 @@
*.lo
-.libs
-*.gcda
*.gcno
+*.gcda
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip.h?r1=1.1.2.3.2.7r2=1.1.2.3.2.8diff_format=u
Index: php-src/ext/zip/lib/zip.h
diff -u php-src/ext/zip/lib/zip.h:1.1.2.3.2.7
php-src/ext/zip/lib/zip.h:1.1.2.3.2.8
--- php-src/ext/zip/lib/zip.h:1.1.2.3.2.7 Wed May 21 09:27:41 2008
+++ php-src/ext/zip/lib/zip.h Thu Aug 7 23:24:11 2008
@@ -70,6 +70,7 @@
#define ZIP_FL_NODIR 2 /* ignore directory component */
#define ZIP_FL_COMPRESSED 4 /* read compressed data */
#define ZIP_FL_UNCHANGED 8 /* use original data, ignoring changes */
+#define ZIP_FL_RECOMPRESS 16 /* force recompression of data */
/* archive global flags flags */
@@ -161,8 +162,6 @@
ZIP_SOURCE_FREE/* cleanup and free resources */
};
-
-
typedef ssize_t (*zip_source_callback)(void *state, void *data,
size_t len, enum zip_source_cmd cmd);
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_close.c?r1=1.1.2.6.2.3r2=1.1.2.6.2.4diff_format=u
Index: php-src/ext/zip/lib/zip_close.c
diff -u php-src/ext/zip/lib/zip_close.c:1.1.2.6.2.3
php-src/ext/zip/lib/zip_close.c:1.1.2.6.2.4
--- php-src/ext/zip/lib/zip_close.c:1.1.2.6.2.3 Sun Aug 3 12:15:55 2008
+++ php-src/ext/zip/lib/zip_close.c Thu Aug 7 23:24:11 2008
@@ -42,16 +42,26 @@
#include zipint.h
-static int add_data(struct zip *, int, struct zip_dirent *, FILE *);
+static int add_data(struct zip *, struct zip_source *, struct zip_dirent *,
+ FILE *);
static int add_data_comp(zip_source_callback, void *, struct zip_stat *,
FILE *, struct zip_error *);
-static int add_data_uncomp(zip_source_callback, void *, struct zip_stat *,
- FILE *, struct zip_error *);
+static int add_data_uncomp(struct zip *, zip_source_callback, void *,
+ struct zip_stat *, FILE *);
static void ch_set_error(struct zip_error *, zip_source_callback, void *);
static int copy_data(FILE *, off_t, FILE *, struct zip_error *);
+static int write_cdir(struct zip *, struct zip_cdir *, FILE *);
static int _zip_cdir_set_comment(struct zip_cdir *, struct zip *);
static int _zip_changed(struct zip *, int *);
static char *_zip_create_temp_output(struct zip *, FILE **);
+static int _zip_torrentzip_cmp(const void *, const void *);
+
+
+
+struct filelist {
+int idx;
+const char *name;
+};
@@ -65,7 +75,9 @@
mode_t mask;
struct zip_cdir *cd;
struct zip_dirent de;
+struct filelist *filelist;
int reopen_on_error;
+int new_torrentzip;
reopen_on_error = 0;
[PHP-CVS] cvs: php-src /ext/dbase .cvsignore CREDITS config.m4 config.w32 dbase.c dbase.dsp dbf.h dbf_head.c dbf_head.h dbf_misc.c dbf_misc.h dbf_ndx.c dbf_ndx.h dbf_rec.c dbf_rec.h package.xml php_db
pajoye Thu Aug 7 23:48:40 2008 UTC Removed files: /php-src/ext/dbase .cvsignore CREDITS config.m4 config.w32 dbase.c dbase.dsp dbf.h dbf_head.c dbf_head.h dbf_misc.c dbf_misc.h dbf_ndx.c dbf_ndx.h dbf_rec.c dbf_rec.h package.xml php_dbase.h /php-src/ext/dbase/tests.cvsignore 001.phpt 002.phpt bug31754.phpt Log: - moved to pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dbase .cvsignore CREDITS config.m4 config.w32 dbase.c dbase.dsp dbf.h dbf_head.c dbf_head.h dbf_misc.c dbf_misc.h dbf_ndx.c dbf_ndx.h dbf_rec.c dbf_rec.h package.x
pajoye Thu Aug 7 23:55:28 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/dbase .cvsignore CREDITS config.m4 config.w32 dbase.c dbase.dsp dbf.h dbf_head.c dbf_head.h dbf_misc.c dbf_misc.h dbf_ndx.c dbf_ndx.h dbf_rec.c dbf_rec.h package.xml php_dbase.h /php-src/ext/dbase/tests.cvsignore 001.phpt 002.phpt bug31754.phpt Log: - MFH: moved to pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
pajoye Thu Aug 7 23:58:40 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - dbase moved to pecl http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.255r2=1.2027.2.547.2.965.2.256diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.255 php-src/NEWS:1.2027.2.547.2.965.2.256 --- php-src/NEWS:1.2027.2.547.2.965.2.255 Thu Aug 7 10:10:58 2008 +++ php-src/NEWSThu Aug 7 23:58:39 2008 @@ -29,6 +29,7 @@ - Upgraded bundled PDO sqlite to version 3.5.9. (Scott) - Moved extensions to PECL (Pierre): + . ext/dbase . ext/fdf . ext/ncurses . ext/sybase (not maintained anymore, sybase_ct has to be used instead) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fbsql .cvsignore CREDITS Readme_w32.txt config.m4 config.w32 fbsql.dsp php_fbsql.c php_fbsql.h
pajoye Fri Aug 8 00:00:35 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/fbsql .cvsignore CREDITS Readme_w32.txt config.m4 config.w32 fbsql.dsp php_fbsql.c php_fbsql.h Log: - moved to PECL -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
pajoye Fri Aug 8 00:01:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - fbsql to pecl http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.256r2=1.2027.2.547.2.965.2.257diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.256 php-src/NEWS:1.2027.2.547.2.965.2.257 --- php-src/NEWS:1.2027.2.547.2.965.2.256 Thu Aug 7 23:58:39 2008 +++ php-src/NEWSFri Aug 8 00:01:10 2008 @@ -30,6 +30,7 @@ - Moved extensions to PECL (Pierre): . ext/dbase + . ext/fbsql . ext/fdf . ext/ncurses . ext/sybase (not maintained anymore, sybase_ct has to be used instead) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
