[PHP-CVS] cvs: php-src / README.UNICODE
andrei Thu Aug 24 21:56:57 2006 UTC Modified files: /php-srcREADME.UNICODE Log: http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE?r1=1.5&r2=1.6&diff_format=u Index: php-src/README.UNICODE diff -u php-src/README.UNICODE:1.5 php-src/README.UNICODE:1.6 --- php-src/README.UNICODE:1.5 Thu Aug 24 21:39:20 2006 +++ php-src/README.UNICODE Thu Aug 24 21:56:57 2006 @@ -32,9 +32,8 @@ Unicode Encoding -The initial version will not support Byte Order Mark. Characters are -expected to be composed, Normalization Form C. Later versions will support -BOM, and decomposed and other characters. +The initial version will not support Byte Order Mark. Text processing will +generally perform better if the characters are in Normalization Form C. Implementation Approach -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.UNICODE
andrei Thu Aug 24 21:39:20 2006 UTC
Modified files:
/php-srcREADME.UNICODE
Log:
Fix typo.
http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE?r1=1.4&r2=1.5&diff_format=u
Index: php-src/README.UNICODE
diff -u php-src/README.UNICODE:1.4 php-src/README.UNICODE:1.5
--- php-src/README.UNICODE:1.4 Tue Jul 11 23:05:33 2006
+++ php-src/README.UNICODE Thu Aug 24 21:39:20 2006
@@ -327,6 +327,7 @@
struct {
UChar *val;/* Unicode string value */
int len; /* number of UChar's */
+} ustr;
} value;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c
pajoye Thu Aug 24 17:54:36 2006 UTC
Modified files:
/php-src/ext/zipphp_zip.c
Log:
- store the resolved path
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.7 php-src/ext/zip/php_zip.c:1.8
--- php-src/ext/zip/php_zip.c:1.7 Thu Aug 24 17:31:20 2006
+++ php-src/ext/zip/php_zip.c Thu Aug 24 17:54:36 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.7 2006/08/24 17:31:20 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.8 2006/08/24 17:54:36 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -898,7 +898,7 @@
if (!intern || err) {
RETURN_LONG((long)err);
}
- ze_obj->filename = estrndup(filename, filename_len);
+ ze_obj->filename = estrndup(resolved_path, strlen(resolved_path));
ze_obj->filename_len = filename_len;
ze_obj->za = intern;
RETURN_TRUE;
@@ -1956,7 +1956,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.7
2006/08/24 17:31:20 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.8
2006/08/24 17:54:36 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "1.4.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
--
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/mbstring/oniguruma/doc API API.ja FAQ FAQ.ja RE RE.ja
masugataThu Aug 24 17:20:59 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/mbstring/oniguruma/doc API API.ja FAQ FAQ.ja RE RE.ja Log: Initial commit. Updated bundled oniguruma library (used for multibyte regular expression) to 4.3.1. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/doc/API.ja?view=markup&rev=1.1 Index: php-src/ext/mbstring/oniguruma/doc/API.ja +++ php-src/ext/mbstring/oniguruma/doc/API.ja http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/doc/FAQ.ja?view=markup&rev=1.1 Index: php-src/ext/mbstring/oniguruma/doc/FAQ.ja +++ php-src/ext/mbstring/oniguruma/doc/FAQ.ja http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/doc/RE.ja?view=markup&rev=1.1 Index: php-src/ext/mbstring/oniguruma/doc/RE.ja +++ php-src/ext/mbstring/oniguruma/doc/RE.ja -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/oniguruma HISTORYindex.html oniguruma.h regcomp.c regexec.c regint.h regparse.c regparse.hregposix.c
Hi, Antony. :) > Could you plz check out this report: http://bugs.php.net/bug.php?id=38452 ? > From what I can see, this commit didn't fix it. > Thanks in advance. confirms it. Please wait a moment... Thank you. -- Seiji Masugata -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c
pajoye Thu Aug 24 17:31:21 2006 UTC
Modified files:
/php-src/ext/zipphp_zip.c
Log:
- MFB: solve the relative path issues in TS environment
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.6 php-src/ext/zip/php_zip.c:1.7
--- php-src/ext/zip/php_zip.c:1.6 Mon Aug 14 15:39:28 2006
+++ php-src/ext/zip/php_zip.c Thu Aug 24 17:31:20 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.6 2006/08/14 15:39:28 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.7 2006/08/24 17:31:20 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -862,6 +862,7 @@
int filename_len;
int err = 0;
long flags = 0;
+ char resolved_path[MAXPATHLEN + 1];
zval *this = getThis();
ze_zip_object *ze_obj = NULL;
@@ -880,6 +881,11 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string as
source");
RETURN_FALSE;
}
+
+ if (!VCWD_REALPATH(filename, resolved_path)) {
+ RETURN_FALSE;
+ }
+
if (ze_obj->za) {
/* we already have an opened zip, free it */
zip_close(ze_obj->za);
@@ -888,7 +894,7 @@
efree(ze_obj->filename);
}
- intern = zip_open(filename, flags, &err);
+ intern = zip_open(resolved_path, flags, &err);
if (!intern || err) {
RETURN_LONG((long)err);
}
@@ -941,6 +947,7 @@
struct zip_source *zs;
long offset_start = 0, offset_len = 0;
int cur_idx;
+ char resolved_path[MAXPATHLEN + 1];
if (!this) {
RETURN_FALSE;
@@ -964,7 +971,11 @@
entry_name_len = filename_len;
}
- zs = zip_source_file(intern, filename, 0, 0);
+ if (!VCWD_REALPATH(filename, resolved_path)) {
+ RETURN_FALSE;
+ }
+
+ zs = zip_source_file(intern, resolved_path, 0, 0);
if (!zs) {
RETURN_FALSE;
}
@@ -1945,7 +1956,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.6
2006/08/14 15:39:28 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.7
2006/08/24 17:31:20 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "1.4.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/oniguruma HISTORY index.html oniguruma.h regcomp.c regexec.c regint.h regparse.c regparse.h regposix.c
On 24.08.2006 21:03, Seiji Masugata wrote: masugataThu Aug 24 17:03:47 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring/oniguruma HISTORY index.html oniguruma.h regcomp.c regexec.c regint.h regparse.c regparse.h regposix.c Log: Updated bundled oniguruma library (used for multibyte regular expression) to 4.3.1. Could you plz check out this report: http://bugs.php.net/bug.php?id=38452 ? From what I can see, this commit didn't fix it. Thanks in advance. -- 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_2) /ext/mbstring/oniguruma AUTHORS
masugataThu Aug 24 17:11:29 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/mbstring/oniguruma AUTHORS Log: Initial commit. Updated bundled oniguruma library (used for multibyte regular expression) to 4.3.1. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
masugataThu Aug 24 16:51:00 2006 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
added returned value in mb_get_info( ).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.259&r2=1.260&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.259
php-src/ext/mbstring/mbstring.c:1.260
--- php-src/ext/mbstring/mbstring.c:1.259 Mon Jul 17 04:44:06 2006
+++ php-src/ext/mbstring/mbstring.c Thu Aug 24 16:51:00 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.259 2006/07/17 04:44:06 masugata Exp $ */
+/* $Id: mbstring.c,v 1.260 2006/08/24 16:51:00 masugata Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3792,6 +3792,7 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, "http_output", name, 1);
}
+ add_assoc_long(return_value, "func_overload",
MBSTRG(func_overload));
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
MAKE_STD_ZVAL(row1);
@@ -3802,9 +3803,9 @@
}
over_func++;
}
- add_assoc_zval(return_value, "func_overload", row1);
+ add_assoc_zval(return_value, "func_overload_list",
row1);
} else {
- add_assoc_string(return_value, "func_overload", "no
overload", 1);
+ add_assoc_string(return_value, "func_overload_list",
"no overload", 1);
}
if (lang != NULL) {
if ((name = (char
*)mbfl_no_encoding2name(lang->mail_charset)) != NULL) {
@@ -3881,6 +3882,8 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp("func_overload", typ)) {
+ RETVAL_LONG(MBSTRG(func_overload));
+ } else if (!strcasecmp("func_overload_list", typ)) {
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
array_init(return_value);
--
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/mbstring/oniguruma HISTORY index.html oniguruma.h regcomp.c regexec.c regint.h regparse.c regparse.h regposix.c
masugataThu Aug 24 17:03:47 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/oniguruma HISTORY index.html oniguruma.h
regcomp.c regexec.c regint.h
regparse.c regparse.h regposix.c
Log:
Updated bundled oniguruma library (used for multibyte regular expression) to
4.3.1.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/HISTORY?r1=1.5.4.1&r2=1.5.4.2&diff_format=u
Index: php-src/ext/mbstring/oniguruma/HISTORY
diff -u php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.1
php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.2
--- php-src/ext/mbstring/oniguruma/HISTORY:1.5.4.1 Thu Jul 20 15:45:06 2006
+++ php-src/ext/mbstring/oniguruma/HISTORY Thu Aug 24 17:03:47 2006
@@ -1,5 +1,61 @@
History
+2006/08/21: Version 4.3.1
+
+2006/08/21: [test] success in ruby 1.9.0 (2006-07-28) [i686-linux].
+2006/08/21: [impl] change stack type values
+ and re-define STK_MASK_TO_VOID_TARGET etc...
+2006/08/21: [impl] set repeat_range[].upper to 0x7fff as infinite.
+2006/08/21: [impl] add STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE.
+2006/08/21: [impl] reduce (?:a*){n,m}, (?:a+){n,m} => (?:a*){n,n}, (?:a+){n,n}
+2006/09/21: [impl] reduce (a*){n,m}, (a+){n,m} => (a*){n,n}, (a+){n,n}
+ if backreference is not used.
+2006/08/17: [bug] should check scan_env.num_call > 0 for backrefed pattern
+ in combination explosion check.
+
+2006/08/17: Version 4.3.0
+
+2006/08/17: [test] success in ruby 1.9.0 (2006-07-28) [i686-linux].
+2006/08/17: [new] add config USE_COMBINATION_EXPLOSION_CHECK.
+ check /(.+)*/, /(\s*foo\s*)*/ etc...
+[API] add num_comb_exp_check member in regex_t.
+[dist] change LTVERSION value to "1:0:0" in configure.in.
+2006/08/15: [bug] OP_REPEAT_INC process in match_at().
+ should check repeat-count >= range-upper and
+ range-upper may be infinite.
+
+2006/08/11: Version 4.2.3
+
+2006/08/11: [test] success in ruby 1.9.0 (2006-07-28) [i686-linux].
+2006/08/10: [impl] remove double call in set_qualifier().
+2006/08/10: [impl] remove by_number member in QualifierNode.
+2006/08/09: [impl] remove a comma at the end of enum ReduceType
+ for escape warning on Mac OS X.
+2006/08/07: [impl] remove warning in regcomp.c.
+2006/08/07: [spec] move definition of USE_BACKREF_AT_LEVEL into NOT_RUBY.
+
+2006/08/03: Version 4.2.2
+
+2006/08/03: [test] success in ruby 1.9.0 (2006-07-28) [i686-linux].
+2006/08/03: [bug] (thanks Hiroyuki Yamamoto)
+ segmentation fault in regexec(). (POSIX API)
+2006/08/02: [bug] combination of \G in look-ahead/look-behind and other
+ anchors(\A, \z, \Z) cause invalid result.
+ ex. /(?!\G)a\z/.match("ba")
+ start arg. of MATCH_ARG_INIT() should be original
+ arg. of onig_search().
+
+2006/07/31: Version 4.2.1
+
+2006/07/31: [test] success in ruby 1.9.0 (2006-07-28) [i686-linux].
+2006/07/31: [bug] (thanks Kimura Minoru)
+ re-implement bm_search_notrev().
+2006/07/31: [impl] bm_search_notrev() refactoring.
+2006/07/31: [bug] (thanks Kimura Minoru)
+ fix incomplete multibyte string in exact info.
+2006/07/31: [impl] (thanks Seiji Masugata)
+ remove cast in va_init_list() for Intel C Compiler.
+
2006/07/18: Version 4.2.0
2006/07/18: [test] success in ruby 1.9.0 (2006-03-01) [i686-linux].
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/oniguruma/index.html?r1=1.2.4.1&r2=1.2.4.2&diff_format=u
Index: php-src/ext/mbstring/oniguruma/index.html
diff -u php-src/ext/mbstring/oniguruma/index.html:1.2.4.1
php-src/ext/mbstring/oniguruma/index.html:1.2.4.2
--- php-src/ext/mbstring/oniguruma/index.html:1.2.4.1 Thu Jul 20 15:45:06 2006
+++ php-src/ext/mbstring/oniguruma/index.html Thu Aug 24 17:03:47 2006
@@ -8,7 +8,7 @@
Oniguruma
-2006/07/18 (C) K.Kosako
+2006/08/21 (C) K.Kosako
@@ -37,8 +37,8 @@
What's new
-Version 4.2.0 released. (2006/07/18)
-Version 2.5.6 released. (2006/05/29)
+Version 4.3.1 released. (2006/08/21)
+Version 2.5.7 released. (2006/07/28)
@@ -70,13 +70,13 @@
Download:
- Latest release version 4.2.0
(2006/07/18) Change Log
- 4.1.2 (2006/07/03)
- 4.1.1 (2006/05/22)
- 4.1.0 (2006/05/15)
- Latest release version 2.5.6
(2006/05/29) Change Log
+ Latest release version 4.3.1
(2006/08/21) Change Log
+ 4.3.0 (2006/08/17)
+ 4.2.2 (2006/08/03)
+ 4.2.1 (2006/07/31)
+ Latest release version 2.5.7
(2006/07/28) Change Log
+ 2.5.6 (2006/05/29)
2.5.5 (2006/05/08)
- 2.5.4 (2006/02/27)
@@ -87,7 +87,7 @@
-Documents: (version 4.2.0)
+Documents: (version 4.3.1)
Regular Expressions
(Japanese: EUC-JP)
@@ -139,6 +139,7 @@
http://www8.ocn.ne.jp/~sonoisa/TiddlyWikiPod/";>TiddlyWikiPod
(Mac OS X)
http://www.cya
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c
pajoye Thu Aug 24 16:37:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zipphp_zip.c
Log:
- solve the relative path issues in TS environment
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.5 php-src/ext/zip/php_zip.c:1.1.2.6
--- php-src/ext/zip/php_zip.c:1.1.2.5 Mon Aug 14 15:07:52 2006
+++ php-src/ext/zip/php_zip.c Thu Aug 24 16:37:14 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.5 2006/08/14 15:07:52 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.6 2006/08/24 16:37:14 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -885,6 +885,7 @@
int filename_len;
int err = 0;
long flags = 0;
+ char resolved_path[MAXPATHLEN + 1];
zval *this = getThis();
ze_zip_object *ze_obj = NULL;
@@ -903,6 +904,11 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty string as
source");
RETURN_FALSE;
}
+
+ if (!VCWD_REALPATH(filename, resolved_path)) {
+ RETURN_FALSE;
+ }
+
if (ze_obj->za) {
/* we already have an opened zip, free it */
zip_close(ze_obj->za);
@@ -910,12 +916,11 @@
if (ze_obj->filename) {
efree(ze_obj->filename);
}
-
- intern = zip_open(filename, flags, &err);
+ intern = zip_open(resolved_path, flags, &err);
if (!intern || err) {
RETURN_LONG((long)err);
}
- ze_obj->filename = estrndup(filename, filename_len);
+ ze_obj->filename = estrndup(resolved_path, strlen(resolved_path));
ze_obj->filename_len = filename_len;
ze_obj->za = intern;
RETURN_TRUE;
@@ -964,6 +969,7 @@
struct zip_source *zs;
long offset_start = 0, offset_len = 0;
int cur_idx;
+ char resolved_path[MAXPATHLEN + 1];
if (!this) {
RETURN_FALSE;
@@ -991,7 +997,11 @@
RETURN_FALSE;
}
- zs = zip_source_file(intern, filename, 0, 0);
+ if (!VCWD_REALPATH(filename, resolved_path)) {
+ RETURN_FALSE;
+ }
+
+ zs = zip_source_file(intern, resolved_path, 0, 0);
if (!zs) {
RETURN_FALSE;
}
@@ -1972,7 +1982,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.5 2006/08/14 15:07:52 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.6 2006/08/24 16:37:14 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "1.4.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
--
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/mbstring mbstring.c
masugataThu Aug 24 16:52:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
added returned value in mb_get_info( ).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.9&r2=1.224.2.22.2.10&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.9
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.10
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.9 Mon Jul 17 04:48:17 2006
+++ php-src/ext/mbstring/mbstring.c Thu Aug 24 16:52:36 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.9 2006/07/17 04:48:17 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.10 2006/08/24 16:52:36 masugata Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -3841,6 +3841,7 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, "http_output", name, 1);
}
+ add_assoc_long(return_value, "func_overload",
MBSTRG(func_overload));
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
MAKE_STD_ZVAL(row1);
@@ -3851,9 +3852,9 @@
}
over_func++;
}
- add_assoc_zval(return_value, "func_overload", row1);
+ add_assoc_zval(return_value, "func_overload_list",
row1);
} else {
- add_assoc_string(return_value, "func_overload", "no
overload", 1);
+ add_assoc_string(return_value, "func_overload_list",
"no overload", 1);
}
if (lang != NULL) {
if ((name = (char
*)mbfl_no_encoding2name(lang->mail_charset)) != NULL) {
@@ -3930,6 +3931,8 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp("func_overload", typ)) {
+ RETVAL_LONG(MBSTRG(func_overload));
+ } else if (!strcasecmp("func_overload_list", typ)) {
if (MBSTRG(func_overload)){
over_func = &(mb_ovld[0]);
array_init(return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo config.m4
tony2001Thu Aug 24 16:00:35 2006 UTC Modified files: /php-src/ext/pdoconfig.m4 Log: it's not a PEAR only issue, this happens with shared builds also http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/config.m4?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.16 php-src/ext/pdo/config.m4:1.17 --- php-src/ext/pdo/config.m4:1.16 Tue Oct 4 07:48:43 2005 +++ php-src/ext/pdo/config.m4 Thu Aug 24 16:00:35 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.16 2005/10/04 07:48:43 helly Exp $ +dnl $Id: config.m4,v 1.17 2006/08/24 16:00:35 tony2001 Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -37,7 +37,6 @@ if test "$ext_shared" = "yes" ; then case $host_alias in *darwin*) -if test "$pdo_running_under_pear" = "1"; then AC_MSG_ERROR([ Due to the way that loadable modules work on OSX/Darwin, you need to compile the PDO package statically into the PHP core. @@ -45,7 +44,6 @@ Please follow the instructions at: http://netevil.org/node.php?nid=202 for more detail on this issue. ]) -fi ext_shared=no ;; esac -- 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/pdo config.m4
tony2001Thu Aug 24 16:00:43 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdoconfig.m4 Log: it's not a PEAR only issue http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/config.m4?r1=1.15.2.3&r2=1.15.2.3.2.1&diff_format=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.15.2.3 php-src/ext/pdo/config.m4:1.15.2.3.2.1 --- php-src/ext/pdo/config.m4:1.15.2.3 Thu Nov 24 21:38:09 2005 +++ php-src/ext/pdo/config.m4 Thu Aug 24 16:00:43 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15.2.3 2005/11/24 21:38:09 wez Exp $ +dnl $Id: config.m4,v 1.15.2.3.2.1 2006/08/24 16:00:43 tony2001 Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -37,7 +37,6 @@ if test "$ext_shared" = "yes" ; then case $host_alias in *darwin*) -if test "$pdo_running_under_pear" = "1"; then AC_MSG_ERROR([ Due to the way that loadable modules work on OSX/Darwin, you need to compile the PDO package statically into the PHP core. @@ -45,7 +44,6 @@ Please follow the instructions at: http://netevil.org/node.php?nid=202 for more detail on this issue. ]) -fi ext_shared=no ;; esac -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Thu Aug 24 15:07:57 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.571&r2=1.2027.2.572&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.571 php-src/NEWS:1.2027.2.572 --- php-src/NEWS:1.2027.2.571 Wed Aug 23 13:17:36 2006 +++ php-src/NEWSThu Aug 24 15:07:56 2006 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2006, PHP 5.1.7 + 24 Aug 2006, PHP 5.1.6 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32). http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.56&r2=1.579.2.57&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.56 php-src/configure.in:1.579.2.57 --- php-src/configure.in:1.579.2.56 Wed Aug 23 13:17:36 2006 +++ php-src/configure.inThu Aug 24 15:07:56 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.56 2006/08/23 13:17:36 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.57 2006/08/24 15:07:56 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ MAJOR_VERSION=5 MINOR_VERSION=1 -RELEASE_VERSION=6 -EXTRA_VERSION="" +RELEASE_VERSION=7 +EXTRA_VERSION="-dev" VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.41&r2=1.112.2.42&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.41 php-src/main/php_version.h:1.112.2.42 --- php-src/main/php_version.h:1.112.2.41 Wed Aug 23 13:17:36 2006 +++ php-src/main/php_version.h Thu Aug 24 15:07:57 2006 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.1.6" +#define PHP_RELEASE_VERSION 7 +#define PHP_EXTRA_VERSION "-dev" +#define PHP_VERSION "5.1.7-dev" -- 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/sysvmsg config.m4
tony2001Thu Aug 24 13:18:24 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/sysvmsgconfig.m4 Log: sys/msg.h does not exist on MacOS X http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/config.m4?r1=1.5&r2=1.5.20.1&diff_format=u Index: php-src/ext/sysvmsg/config.m4 diff -u php-src/ext/sysvmsg/config.m4:1.5 php-src/ext/sysvmsg/config.m4:1.5.20.1 --- php-src/ext/sysvmsg/config.m4:1.5 Sun Oct 27 11:56:06 2002 +++ php-src/ext/sysvmsg/config.m4 Thu Aug 24 13:18:24 2006 @@ -1,9 +1,14 @@ -dnl $Id: config.m4,v 1.5 2002/10/27 11:56:06 msopacua Exp $ +dnl $Id: config.m4,v 1.5.20.1 2006/08/24 13:18:24 tony2001 Exp $ PHP_ARG_ENABLE(sysvmsg,whether to enable System V IPC support, [ --enable-sysvmsgEnable sysvmsg support]) if test "$PHP_SYSVMSG" != "no"; then + AC_CHECK_HEADER([sys/msg.h], +[], +[AC_MSG_ERROR([Cannot enable System V IPC support, sys/msg.h is missing]) + ]) + AC_DEFINE(HAVE_SYSVMSG, 1, [ ]) PHP_NEW_EXTENSION(sysvmsg, sysvmsg.c, $ext_shared) fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sysvmsg config.m4
tony2001Thu Aug 24 13:18:15 2006 UTC Modified files: /php-src/ext/sysvmsgconfig.m4 Log: sys/msg.h does not exist on MacOS X, we need to detect it in configure http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/config.m4?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/sysvmsg/config.m4 diff -u php-src/ext/sysvmsg/config.m4:1.5 php-src/ext/sysvmsg/config.m4:1.6 --- php-src/ext/sysvmsg/config.m4:1.5 Sun Oct 27 11:56:06 2002 +++ php-src/ext/sysvmsg/config.m4 Thu Aug 24 13:18:15 2006 @@ -1,9 +1,14 @@ -dnl $Id: config.m4,v 1.5 2002/10/27 11:56:06 msopacua Exp $ +dnl $Id: config.m4,v 1.6 2006/08/24 13:18:15 tony2001 Exp $ PHP_ARG_ENABLE(sysvmsg,whether to enable System V IPC support, [ --enable-sysvmsgEnable sysvmsg support]) if test "$PHP_SYSVMSG" != "no"; then + AC_CHECK_HEADER([sys/msg.h], +[], +[AC_MSG_ERROR([Cannot enable System V IPC support, sys/msg.h is missing]) + ]) + AC_DEFINE(HAVE_SYSVMSG, 1, [ ]) PHP_NEW_EXTENSION(sysvmsg, sysvmsg.c, $ext_shared) fi -- 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/oci8 oci8.c
tony2001Thu Aug 24 13:03:04 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8.c Log: update version in phpinfo() http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.22&r2=1.269.2.16.2.23&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.22 php-src/ext/oci8/oci8.c:1.269.2.16.2.23 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.22 Thu Aug 24 12:46:54 2006 +++ php-src/ext/oci8/oci8.c Thu Aug 24 13:03:04 2006 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.22 2006/08/24 12:46:54 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.23 2006/08/24 13:03:04 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -666,8 +666,8 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Version", "1.2.1"); - php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.22 $"); + php_info_print_table_row(2, "Version", "1.2.2"); + php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.23 $"); sprintf(buf, "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Thu Aug 24 13:02:53 2006 UTC Modified files: /php-src/ext/oci8 oci8.c Log: update version in phpinfo() http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.319&r2=1.320&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.319 php-src/ext/oci8/oci8.c:1.320 --- php-src/ext/oci8/oci8.c:1.319 Thu Aug 24 12:46:52 2006 +++ php-src/ext/oci8/oci8.c Thu Aug 24 13:02:53 2006 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.319 2006/08/24 12:46:52 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.320 2006/08/24 13:02:53 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -666,8 +666,8 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Version", "1.2.1"); - php_info_print_table_row(2, "Revision", "$Revision: 1.319 $"); + php_info_print_table_row(2, "Version", "1.2.2"); + php_info_print_table_row(2, "Revision", "$Revision: 1.320 $"); sprintf(buf, "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); -- 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/oci8 oci8.c
tony2001Thu Aug 24 12:46:54 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/oci8 oci8.c Log: bump version number http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.21&r2=1.269.2.16.2.22&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.21 php-src/ext/oci8/oci8.c:1.269.2.16.2.22 --- php-src/ext/oci8/oci8.c:1.269.2.16.2.21 Thu Aug 24 12:05:19 2006 +++ php-src/ext/oci8/oci8.c Thu Aug 24 12:46:54 2006 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.269.2.16.2.21 2006/08/24 12:05:19 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.269.2.16.2.22 2006/08/24 12:46:54 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -374,7 +374,7 @@ PHP_RINIT(oci), /* per-request startup function */ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ - "1.2.1", + "1.2.2", #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1) || (PHP_MAJOR_VERSION > 5) PHP_MODULE_GLOBALS(oci), /* globals descriptor */ PHP_GINIT(oci), /* globals ctor */ @@ -667,7 +667,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", "1.2.1"); - php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.21 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.22 $"); sprintf(buf, "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Thu Aug 24 12:46:52 2006 UTC Modified files: /php-src/ext/oci8 oci8.c Log: bump version number http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.318&r2=1.319&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.318 php-src/ext/oci8/oci8.c:1.319 --- php-src/ext/oci8/oci8.c:1.318 Tue Aug 22 11:08:28 2006 +++ php-src/ext/oci8/oci8.c Thu Aug 24 12:46:52 2006 @@ -26,7 +26,7 @@ +--+ */ -/* $Id: oci8.c,v 1.318 2006/08/22 11:08:28 tony2001 Exp $ */ +/* $Id: oci8.c,v 1.319 2006/08/24 12:46:52 tony2001 Exp $ */ /* TODO * * file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty() with OCI_ATTR_LOBEMPTY @@ -374,7 +374,7 @@ PHP_RINIT(oci), /* per-request startup function */ PHP_RSHUTDOWN(oci), /* per-request shutdown function */ PHP_MINFO(oci), /* information function */ - "1.2.1", + "1.2.2", #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1) || (PHP_MAJOR_VERSION > 5) PHP_MODULE_GLOBALS(oci), /* globals descriptor */ PHP_GINIT(oci), /* globals ctor */ @@ -667,7 +667,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", "1.2.1"); - php_info_print_table_row(2, "Revision", "$Revision: 1.318 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.319 $"); sprintf(buf, "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); -- 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/zlib/tests 005.phpt
tony2001Thu Aug 24 11:30:35 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib/tests 005.phpt Log: the error message is different on different OSes and zlib versions http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/005.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/zlib/tests/005.phpt diff -u php-src/ext/zlib/tests/005.phpt:1.1.2.1 php-src/ext/zlib/tests/005.phpt:1.1.2.2 --- php-src/ext/zlib/tests/005.phpt:1.1.2.1 Mon Jun 26 23:35:22 2006 +++ php-src/ext/zlib/tests/005.phpt Thu Aug 24 11:30:35 2006 @@ -49,16 +49,16 @@ Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) Warning: gzuncompress(): length (-1) must be greater or equal zero in %s on line %d bool(false) -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart @@ -67,6 +67,6 @@ Cry to relieve what's in your heart Desolation, grief and agony" -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib/tests 005.phpt
tony2001Thu Aug 24 11:30:29 2006 UTC Modified files: /php-src/ext/zlib/tests 005.phpt Log: the error message is different on different OSes and zlib versions http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/005.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zlib/tests/005.phpt diff -u php-src/ext/zlib/tests/005.phpt:1.3 php-src/ext/zlib/tests/005.phpt:1.4 --- php-src/ext/zlib/tests/005.phpt:1.3 Thu Jul 27 16:31:07 2006 +++ php-src/ext/zlib/tests/005.phpt Thu Aug 24 11:30:28 2006 @@ -49,16 +49,16 @@ Warning: gzuncompress() expects at least 1 parameter, 0 given in %s on line %d NULL -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) Warning: gzuncompress(): length (-1) must be greater or equal zero in %s on line %d bool(false) -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart @@ -67,6 +67,6 @@ Cry to relieve what's in your heart Desolation, grief and agony" -Warning: gzuncompress(): data error in %s on line %d +Warning: gzuncompress(): %s error in %s on line %d bool(false) Done -- 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/time bug38524.phpt
tony2001Thu Aug 24 11:27:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/timebug38524.phpt
Log:
tm_yday may be 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/time/bug38524.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/time/bug38524.phpt
diff -u php-src/ext/standard/tests/time/bug38524.phpt:1.1.2.1
php-src/ext/standard/tests/time/bug38524.phpt:1.1.2.2
--- php-src/ext/standard/tests/time/bug38524.phpt:1.1.2.1 Sun Aug 20
18:20:07 2006
+++ php-src/ext/standard/tests/time/bug38524.phpt Thu Aug 24 11:27:20 2006
@@ -5,7 +5,7 @@
var_dump(strptime('2006-08-20', '%Y-%m-%d'));
?>
===DONE===
---EXPECT--
+--EXPECTF--
array(9) {
["tm_sec"]=>
int(0)
@@ -22,7 +22,7 @@
["tm_wday"]=>
int(0)
["tm_yday"]=>
- int(231)
+ int(%d)
["unparsed"]=>
string(0) ""
}
--
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/time bug38524.phpt
tony2001Thu Aug 24 11:27:06 2006 UTC
Modified files:
/php-src/ext/standard/tests/timebug38524.phpt
Log:
tm_yday may be 0 (Solaris)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/time/bug38524.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/time/bug38524.phpt
diff -u php-src/ext/standard/tests/time/bug38524.phpt:1.2
php-src/ext/standard/tests/time/bug38524.phpt:1.3
--- php-src/ext/standard/tests/time/bug38524.phpt:1.2 Sun Aug 20 18:20:59 2006
+++ php-src/ext/standard/tests/time/bug38524.phpt Thu Aug 24 11:27:06 2006
@@ -5,7 +5,7 @@
var_dump(strptime('2006-08-20', '%Y-%m-%d'));
?>
===DONE===
---EXPECT--
+--EXPECTF--
array(9) {
["tm_sec"]=>
int(0)
@@ -22,7 +22,7 @@
["tm_wday"]=>
int(0)
["tm_yday"]=>
- int(231)
+ int(%d)
["unparsed"]=>
string(0) ""
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard config.m4 datetime.c
tony2001Thu Aug 24 11:05:38 2006 UTC
Modified files:
/php-src/ext/standard config.m4 datetime.c
Log:
this fixes segfault in strptime() on 64bit Linuxes, caused by the missing
declaration
unfortunately defining _XOPEN_SOURCE breaks the build (some odd dependencies
in glibc headers) and this seems to be the best solution
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.83&r2=1.84&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.83 php-src/ext/standard/config.m4:1.84
--- php-src/ext/standard/config.m4:1.83 Wed Jan 4 12:57:04 2006
+++ php-src/ext/standard/config.m4 Thu Aug 24 11:05:38 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.83 2006/01/04 12:57:04 derick Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.84 2006/08/24 11:05:38 tony2001 Exp $ -*- autoconf -*-
divert(3)dnl
@@ -477,6 +477,26 @@
AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
fi
+AC_CACHE_CHECK(whether strptime() declaration fails,
ac_cv_strptime_decl_fails,[
+ AC_TRY_COMPILE([
+#include
+ ],[
+#ifndef HAVE_STRPTIME
+#error no strptime() on this platform
+#else
+/* use invalid strptime() declaration to see if it fails to compile */
+int strptime(const char *s, const char *format, struct tm *tm);
+#endif
+ ],[
+ ac_cv_strptime_decl_fails=no
+ ],[
+ ac_cv_strptime_decl_fails=yes
+ ])
+])
+if test "$ac_cv_strptime_decl_fails" = "yes"; then
+ AC_DEFINE([HAVE_STRPTIME_DECL_FAILS], 1, [whether strptime() declaration
fails])
+fi
+
PHP_CHECK_I18N_FUNCS
PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c
crc32.c crypt.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.138
php-src/ext/standard/datetime.c:1.139
--- php-src/ext/standard/datetime.c:1.138 Sun Aug 20 18:20:59 2006
+++ php-src/ext/standard/datetime.c Thu Aug 24 11:05:38 2006
@@ -18,11 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.138 2006/08/20 18:20:59 iliaa Exp $ */
-
-#if HAVE_STRPTIME
-#define _XOPEN_SOURCE
-#endif
+/* $Id: datetime.c,v 1.139 2006/08/24 11:05:38 tony2001 Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -85,6 +81,10 @@
#if HAVE_STRPTIME
+#ifndef HAVE_STRPTIME_DECL_FAILS
+char *strptime(const char *s, const char *format, struct tm *tm);
+#endif
+
/* {{{ proto string strptime(string timestamp, string format)
Parse a time/date generated with strftime() */
PHP_FUNCTION(strptime)
--
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 config.m4 datetime.c
tony2001Thu Aug 24 11:06:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard config.m4 datetime.c
Log:
MFH: fix segfault in strptime() on 64bit Linuxes, caused by the missing
declaration
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.80.2.3&r2=1.80.2.3.2.1&diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.80.2.3
php-src/ext/standard/config.m4:1.80.2.3.2.1
--- php-src/ext/standard/config.m4:1.80.2.3 Wed Jan 4 21:31:29 2006
+++ php-src/ext/standard/config.m4 Thu Aug 24 11:06:02 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.80.2.3 2006/01/04 21:31:29 derick Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.80.2.3.2.1 2006/08/24 11:06:02 tony2001 Exp $ -*-
autoconf -*-
divert(3)dnl
@@ -477,6 +477,26 @@
AC_DEFINE([HAVE_HUGE_VAL_NAN], 1, [whether HUGE_VAL + -HUGEVAL == NAN])
fi
+AC_CACHE_CHECK(whether strptime() declaration fails,
ac_cv_strptime_decl_fails,[
+ AC_TRY_COMPILE([
+#include
+ ],[
+#ifndef HAVE_STRPTIME
+#error no strptime() on this platform
+#else
+/* use invalid strptime() declaration to see if it fails to compile */
+int strptime(const char *s, const char *format, struct tm *tm);
+#endif
+ ],[
+ ac_cv_strptime_decl_fails=no
+ ],[
+ ac_cv_strptime_decl_fails=yes
+ ])
+])
+if test "$ac_cv_strptime_decl_fails" = "yes"; then
+ AC_DEFINE([HAVE_STRPTIME_DECL_FAILS], 1, [whether strptime() declaration
fails])
+fi
+
PHP_CHECK_I18N_FUNCS
PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c
crc32.c crypt.c \
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/datetime.c?r1=1.134.2.2.2.1&r2=1.134.2.2.2.2&diff_format=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.134.2.2.2.1
php-src/ext/standard/datetime.c:1.134.2.2.2.2
--- php-src/ext/standard/datetime.c:1.134.2.2.2.1 Sun Aug 20 18:20:07 2006
+++ php-src/ext/standard/datetime.c Thu Aug 24 11:06:02 2006
@@ -18,11 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.134.2.2.2.1 2006/08/20 18:20:07 iliaa Exp $ */
-
-#if HAVE_STRPTIME
-#define _XOPEN_SOURCE
-#endif
+/* $Id: datetime.c,v 1.134.2.2.2.2 2006/08/24 11:06:02 tony2001 Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -85,6 +81,10 @@
#if HAVE_STRPTIME
+#ifndef HAVE_STRPTIME_DECL_FAILS
+char *strptime(const char *s, const char *format, struct tm *tm);
+#endif
+
/* {{{ proto string strptime(string timestamp, string format)
Parse a time/date generated with strftime() */
PHP_FUNCTION(strptime)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/standard/tests/file bug38450.phpt /main user_streams.c
tony2001Thu Aug 24 08:42:16 2006 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/standard/tests/filebug38450.phpt
Modified files:
/php-srcNEWS
/php-src/main user_streams.c
Log:
fix #38450 (constructor is not called for classes used in userspace stream
wrappers)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.158&r2=1.1247.2.920.2.159&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.158 php-src/NEWS:1.1247.2.920.2.159
--- php-src/NEWS:1.1247.2.920.2.158 Thu Aug 24 08:30:28 2006
+++ php-src/NEWSThu Aug 24 08:42:16 2006
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||
?? ??? 2006, Version 4.4.5
+- Fixed bug #38450 (constructor is not called for classes used in userspace
+ stream wrappers). (Tony)
- Fixed bug #38378 (wddx_serialize_value() generates no wellformed xml).
(sj at sjaensch dot org, grzegorz dot nosek at netart dot pl, Tony).
http://cvs.php.net/viewvc.cgi/php-src/main/user_streams.c?r1=1.29.2.4.2.2&r2=1.29.2.4.2.3&diff_format=u
Index: php-src/main/user_streams.c
diff -u php-src/main/user_streams.c:1.29.2.4.2.2
php-src/main/user_streams.c:1.29.2.4.2.3
--- php-src/main/user_streams.c:1.29.2.4.2.2Sun Jan 1 13:47:00 2006
+++ php-src/main/user_streams.c Thu Aug 24 08:42:16 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: user_streams.c,v 1.29.2.4.2.2 2006/01/01 13:47:00 sniper Exp $ */
+/* $Id: user_streams.c,v 1.29.2.4.2.3 2006/08/24 08:42:16 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -193,7 +193,33 @@
object_init_ex(us->object, uwrap->ce);
ZVAL_REFCOUNT(us->object) = 1;
PZVAL_IS_REF(us->object) = 1;
-
+
+ if (zend_hash_exists(&uwrap->ce->function_table, uwrap->ce->name,
uwrap->ce->name_length+1)) {
+ zval *retval_ptr;
+ zval *function_name;
+
+ MAKE_STD_ZVAL(function_name);
+ ZVAL_STRINGL(function_name, uwrap->ce->name,
uwrap->ce->name_length, 1);
+
+ if (call_user_function_ex(EG(function_table), &us->object,
function_name, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
execute %s::%s()", uwrap->ce->name, uwrap->ce->name);
+ zval_dtor(function_name);
+ FREE_ZVAL(function_name);
+ zval_dtor(us->object);
+ FREE_ZVAL(us->object);
+ efree(us);
+ FG(user_stream_current_filename) = NULL;
+ return NULL;
+ } else {
+ if (retval_ptr) {
+ zval_ptr_dtor(&retval_ptr);
+ }
+ }
+ zval_dtor(function_name);
+ FREE_ZVAL(function_name);
+ }
+
+
/* call it's stream_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, filename, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug38450.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug38450.phpt
+++ php-src/ext/standard/tests/file/bug38450.phpt
--TEST--
Bug #38450 (constructor is not called for classes used in userspace stream
wrappers)
--FILE--
varname = $url["host"];
$this->position = 0;
return true;
}
function stream_read($count)
{
$ret = substr($GLOBALS[$this->varname], $this->position,
$count);
$this->position += strlen($ret);
return $ret;
}
function stream_write($data)
{
$left = substr($GLOBALS[$this->varname], 0, $this->position);
$right = substr($GLOBALS[$this->varname], $this->position +
strlen($data));
$GLOBALS[$this->varname] = $left . $data . $right;
$this->position += strlen($data);
return strlen($data);
}
function stream_tell()
{
return $this->position;
}
function stream_eof()
{
return $this->position >= strlen($GLOBALS[$this->varname]);
}
function stream_seek($offset, $whence)
{
switch ($whence) {
case SEEK_SET:
if ($offset < strlen($GLOBALS[$this->varname]) &&
$offset >= 0) {
$this->position = $offset;
return true;
} else {
return false;
}
break;
case SEEK_CUR:
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/wddx wddx.c /ext/wddx/tests bug38738.phpt
tony2001Thu Aug 24 08:30:28 2006 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/wddx/tests bug38738.phpt
Modified files:
/php-srcNEWS
/php-src/ext/wddx wddx.c
Log:
fix #38378 (wddx_serialize_value() generates no wellformed xml)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.157&r2=1.1247.2.920.2.158&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.157 php-src/NEWS:1.1247.2.920.2.158
--- php-src/NEWS:1.1247.2.920.2.157 Tue Aug 15 12:23:08 2006
+++ php-src/NEWSThu Aug 24 08:30:28 2006
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||
?? ??? 2006, Version 4.4.5
+- Fixed bug #38378 (wddx_serialize_value() generates no wellformed xml).
+ (sj at sjaensch dot org, grzegorz dot nosek at netart dot pl, Tony).
17 Aug 2006, Version 4.4.4
- Fixed memory_limit on 64bit systems. (Stefan E.)
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.96.2.6.2.7&r2=1.96.2.6.2.8&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.96.2.6.2.7
php-src/ext/wddx/wddx.c:1.96.2.6.2.8
--- php-src/ext/wddx/wddx.c:1.96.2.6.2.7Fri May 26 01:55:26 2006
+++ php-src/ext/wddx/wddx.c Thu Aug 24 08:30:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.96.2.6.2.7 2006/05/26 01:55:26 iliaa Exp $ */
+/* $Id: wddx.c,v 1.96.2.6.2.8 2006/08/24 08:30:28 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -432,7 +432,7 @@
tmp = *var;
zval_copy_ctor(&tmp);
convert_to_string(&tmp);
- snprintf(tmp_buf, Z_STRLEN(tmp), WDDX_NUMBER, Z_STRVAL(tmp));
+ snprintf(tmp_buf, sizeof(tmp_buf), WDDX_NUMBER, Z_STRVAL(tmp));
zval_dtor(&tmp);
php_wddx_add_chunk(packet, tmp_buf);
@@ -630,8 +630,8 @@
if (name) {
name_esc = php_escape_html_entities(name, name_len,
&name_esc_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
- tmp_buf = emalloc(name_esc_len + 1);
- snprintf(tmp_buf, name_esc_len, WDDX_VAR_S, name_esc);
+ tmp_buf = emalloc(name_esc_len + sizeof(WDDX_VAR_S));
+ snprintf(tmp_buf, name_esc_len + sizeof(WDDX_VAR_S),
WDDX_VAR_S, name_esc);
php_wddx_add_chunk(packet, tmp_buf);
efree(tmp_buf);
efree(name_esc);
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/bug38738.phpt?view=markup&rev=1.1
Index: php-src/ext/wddx/tests/bug38738.phpt
+++ php-src/ext/wddx/tests/bug38738.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
