[PHP-CVS] cvs: php-src /ext/mbstring config.m4
hirokawaMon Oct 2 23:27:43 2006 UTC Modified files: /php-src/ext/mbstring config.m4 Log: fixed --disable-mbregex to disable multibe-regex. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.63&r2=1.64&diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.63 php-src/ext/mbstring/config.m4:1.64 --- php-src/ext/mbstring/config.m4:1.63 Mon Oct 2 15:32:48 2006 +++ php-src/ext/mbstring/config.m4 Mon Oct 2 23:27:43 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.63 2006/10/02 15:32:48 hirokawa Exp $ +dnl $Id: config.m4,v 1.64 2006/10/02 23:27:43 hirokawa Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -271,7 +271,6 @@ if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) - AC_DEFINE([HAVE_MBREGEX], 0,[whether to have multibyte regex support]) PHP_MBSTRING_ADD_BASE_SOURCES([mbstring.c php_unicode.c mb_gpc.c]) -- 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) / NEWS /ext/pdo_mysql mysql_driver.c
tony2001Mon Oct 2 22:09:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/pdo_mysql mysql_driver.c
Log:
MFH: fix #38996 (PDO_MYSQL doesn't check connections for liveness)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.277&r2=1.2027.2.547.2.278&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.277 php-src/NEWS:1.2027.2.547.2.278
--- php-src/NEWS:1.2027.2.547.2.277 Mon Oct 2 15:34:38 2006
+++ php-src/NEWSMon Oct 2 22:09:48 2006
@@ -11,6 +11,7 @@
- Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony)
- Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for
protected properties). (Tony)
+- Fixed bug #38996 (PDO_MYSQL doesn't check connections for liveness). (Tony)
- Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
session.save_path, allowing them to account for extra parameters). (Ilia)
- Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.59.2.13&r2=1.59.2.13.2.1&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13
php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13.2.1
--- php-src/ext/pdo_mysql/mysql_driver.c:1.59.2.13 Sun Apr 9 08:11:31 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Oct 2 22:09:49 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.59.2.13 2006/04/09 08:11:31 wez Exp $ */
+/* $Id: mysql_driver.c,v 1.59.2.13.2.1 2006/10/02 22:09:49 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -379,6 +379,34 @@
return 1;
}
+static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+{
+ pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
+#if MYSQL_VERSION_ID <= 32230
+ void (*handler) (int);
+ unsigned int my_errno;
+#endif
+
+#if MYSQL_VERSION_ID > 32230
+ if (mysql_ping(H->server)) {
+ return FAILURE;
+ }
+#else /* no mysql_ping() */
+ handler=signal(SIGPIPE, SIG_IGN);
+ mysql_stat(H->server);
+ switch (mysql_errno(H->server)) {
+ case CR_SERVER_GONE_ERROR:
+ /* case CR_SERVER_LOST: I'm not sure this means the same as
"gone" for us */
+ signal(SIGPIPE, handler);
+ return FAILURE;
+ default:
+ break;
+ }
+ signal(SIGPIPE, handler);
+#endif /* end mysql_ping() */
+ return SUCCESS;
+}
+/* }}} */
static struct pdo_dbh_methods mysql_methods = {
mysql_handle_closer,
@@ -392,7 +420,7 @@
pdo_mysql_last_insert_id,
pdo_mysql_fetch_error_func,
pdo_mysql_get_attribute,
- NULL /* check_liveness: TODO: ping */
+ pdo_mysql_check_liveness
};
#ifndef PDO_MYSQL_UNIX_ADDR
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_mysql mysql_driver.c
tony2001Mon Oct 2 22:07:58 2006 UTC
Modified files:
/php-src/ext/pdo_mysql mysql_driver.c
Log:
fix #38996 (PDO_MYSQL doesn't check connections for liveness)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.73
php-src/ext/pdo_mysql/mysql_driver.c:1.74
--- php-src/ext/pdo_mysql/mysql_driver.c:1.73 Thu Mar 23 01:37:38 2006
+++ php-src/ext/pdo_mysql/mysql_driver.cMon Oct 2 22:07:58 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mysql_driver.c,v 1.73 2006/03/23 01:37:38 pajoye Exp $ */
+/* $Id: mysql_driver.c,v 1.74 2006/10/02 22:07:58 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -368,6 +368,34 @@
return 1;
}
+static int pdo_mysql_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
+{
+ pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
+#if MYSQL_VERSION_ID <= 32230
+ void (*handler) (int);
+ unsigned int my_errno;
+#endif
+
+#if MYSQL_VERSION_ID > 32230
+ if (mysql_ping(H->server)) {
+ return FAILURE;
+ }
+#else /* no mysql_ping() */
+ handler=signal(SIGPIPE, SIG_IGN);
+ mysql_stat(H->server);
+ switch (mysql_errno(H->server)) {
+ case CR_SERVER_GONE_ERROR:
+ /* case CR_SERVER_LOST: I'm not sure this means the same as
"gone" for us */
+ signal(SIGPIPE, handler);
+ return FAILURE;
+ default:
+ break;
+ }
+ signal(SIGPIPE, handler);
+#endif /* end mysql_ping() */
+ return SUCCESS;
+}
+/* }}} */
static struct pdo_dbh_methods mysql_methods = {
mysql_handle_closer,
@@ -381,7 +409,7 @@
pdo_mysql_last_insert_id,
pdo_mysql_fetch_error_func,
pdo_mysql_get_attribute,
- NULL /* check_liveness: TODO: ping */
+ pdo_mysql_check_liveness
};
#ifndef PDO_MYSQL_UNIX_ADDR
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
pollita Mon Oct 2 21:02:08 2006 UTC
Modified files:
/php-src/ext/standard proc_open.c
Log:
Flag the easy stuff out of the way, proc_open() is the real beast in here
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.43&r2=1.44&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.43
php-src/ext/standard/proc_open.c:1.44
--- php-src/ext/standard/proc_open.c:1.43 Tue Sep 19 10:38:31 2006
+++ php-src/ext/standard/proc_open.cMon Oct 2 21:02:08 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: proc_open.c,v 1.43 2006/09/19 10:38:31 dmitry Exp $ */
+/* $Id: proc_open.c,v 1.44 2006/10/02 21:02:08 pollita Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -253,7 +253,7 @@
}
/* }}} */
-/* {{{ proto int proc_terminate(resource process [, long signal])
+/* {{{ proto int proc_terminate(resource process [, long signal]) U
kill a process opened by proc_open */
PHP_FUNCTION(proc_terminate)
{
@@ -278,7 +278,7 @@
}
/* }}} */
-/* {{{ proto int proc_close(resource process)
+/* {{{ proto int proc_close(resource process) U
close a process opened by proc_open */
PHP_FUNCTION(proc_close)
{
@@ -296,7 +296,7 @@
}
/* }}} */
-/* {{{ proto array proc_get_status(resource process)
+/* {{{ proto array proc_get_status(resource process) U
get information about a process opened by proc_open */
PHP_FUNCTION(proc_get_status)
{
@@ -319,7 +319,19 @@
array_init(return_value);
- add_ascii_assoc_string(return_value, "command", proc->command, 1);
+ if (UG(unicode)) {
+ UChar *ucmd;
+ int ucmd_len;
+
+ if (SUCCESS == php_stream_path_decode(&php_plain_files_wrapper,
&ucmd, &ucmd_len, proc->command, strlen(proc->command), REPORT_ERRORS,
FG(default_context))) {
+ add_ascii_assoc_unicodel(return_value, "command", ucmd,
ucmd_len, 0);
+ } else {
+ /* Fallback on original binary string */
+ add_ascii_assoc_string(return_value, "command",
proc->command, 1);
+ }
+ } else {
+ add_ascii_assoc_string(return_value, "command", proc->command,
1);
+ }
add_ascii_assoc_long(return_value, "pid", (long) proc->child);
#ifdef PHP_WIN32
--
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) / acinclude.m4
tony2001Mon Oct 2 20:53:05 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcacinclude.m4 Log: MFH: the last part of the fix for #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.218.2.50.2.7&r2=1.218.2.50.2.8&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.50.2.7 php-src/acinclude.m4:1.218.2.50.2.8 --- php-src/acinclude.m4:1.218.2.50.2.7 Mon Oct 2 19:22:45 2006 +++ php-src/acinclude.m4Mon Oct 2 20:53:05 2006 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.50.2.7 2006/10/02 19:22:45 tony2001 Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.218.2.50.2.8 2006/10/02 20:53:05 tony2001 Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -569,6 +569,11 @@ done echo "'[$]0' \\" >> $1 + if test `expr -- [$]0 : "'.*"` = 0; then +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" + else +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" + fi for arg in $ac_configure_args; do if test `expr -- $arg : "'.*"` = 0; then if test `expr -- $arg : "--.*"` = 0; then -- 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) /ext/standard url.c
tony2001Mon Oct 2 20:52:46 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard url.c
Log:
fix compile warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.58.2.21.2.4&r2=1.58.2.21.2.5&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.21.2.4
php-src/ext/standard/url.c:1.58.2.21.2.5
--- php-src/ext/standard/url.c:1.58.2.21.2.4Thu Sep 28 15:16:40 2006
+++ php-src/ext/standard/url.c Mon Oct 2 20:52:46 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+--+
*/
-/* $Id: url.c,v 1.58.2.21.2.4 2006/09/28 15:16:40 iliaa Exp $ */
+/* $Id: url.c,v 1.58.2.21.2.5 2006/10/02 20:52:46 tony2001 Exp $ */
#include
#include
@@ -204,7 +204,7 @@
}
{
- char *t = s;
+ const char *t = s;
p = NULL;
while (e > t && (t = memchr(t, '@', (e-t {
p = t++;
--
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) / acinclude.m4
tony2001Mon Oct 2 20:49:23 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 Log: MFH: the last part of the fix for #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.4&r2=1.332.2.14.2.5&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.4 php-src/acinclude.m4:1.332.2.14.2.5 --- php-src/acinclude.m4:1.332.2.14.2.4 Mon Oct 2 19:17:53 2006 +++ php-src/acinclude.m4Mon Oct 2 20:49:23 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.4 2006/10/02 19:17:53 tony2001 Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.5 2006/10/02 20:49:23 tony2001 Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2504,6 +2504,11 @@ done echo "'[$]0' \\" >> $1 + if test `expr -- [$]0 : "'.*"` = 0; then +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" + else +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" + fi for arg in $ac_configure_args; do if test `expr -- $arg : "'.*"` = 0; then if test `expr -- $arg : "--.*"` = 0; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
tony2001Mon Oct 2 20:49:13 2006 UTC Modified files: /php-srcacinclude.m4 Log: the last part of the fix for #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.349&r2=1.350&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.349 php-src/acinclude.m4:1.350 --- php-src/acinclude.m4:1.349 Mon Oct 2 19:17:43 2006 +++ php-src/acinclude.m4Mon Oct 2 20:49:13 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.349 2006/10/02 19:17:43 tony2001 Exp $ +dnl $Id: acinclude.m4,v 1.350 2006/10/02 20:49:13 tony2001 Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2504,6 +2504,11 @@ done echo "'[$]0' \\" >> $1 + if test `expr -- [$]0 : "'.*"` = 0; then +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" + else +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" + fi for arg in $ac_configure_args; do if test `expr -- $arg : "'.*"` = 0; then if test `expr -- $arg : "--.*"` = 0; then -- 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 string.c
andrei Mon Oct 2 20:07:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
Use php_error_docref() instead.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.21&r2=1.445.2.14.2.22&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.21
php-src/ext/standard/string.c:1.445.2.14.2.22
--- php-src/ext/standard/string.c:1.445.2.14.2.21 Mon Oct 2 19:58:15 2006
+++ php-src/ext/standard/string.c Mon Oct 2 20:07:14 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.21 2006/10/02 19:58:15 andrei Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.22 2006/10/02 20:07:14 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1768,14 +1768,14 @@
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is
greater than the length of haystack string");
RETURN_FALSE;
}
p = haystack + offset;
e = haystack + haystack_len - needle_len;
} else {
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is
greater than the length of haystack string");
RETURN_FALSE;
}
@@ -1844,7 +1844,7 @@
Can also avoid tolower emallocs */
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the
length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Offset is greater than the length of haystack string");
RETURN_FALSE;
}
p = haystack + offset;
@@ -1852,7 +1852,7 @@
} else {
p = haystack;
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the
length of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Offset is greater than the length of haystack string");
RETURN_FALSE;
} else {
e = haystack + haystack_len + offset;
@@ -1876,14 +1876,14 @@
if (offset >= 0) {
if (offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is
greater than the length of haystack string");
RETURN_FALSE;
}
p = haystack_dup + offset;
e = haystack_dup + haystack_len - needle_len;
} else {
if (-offset > haystack_len) {
- php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is
greater than the length of haystack string");
RETURN_FALSE;
}
p = haystack_dup;
--
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 string.c
andrei Mon Oct 2 19:58:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
More offset fixes. Added E_NOTICE where appropriate.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.20&r2=1.445.2.14.2.21&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.20
php-src/ext/standard/string.c:1.445.2.14.2.21
--- php-src/ext/standard/string.c:1.445.2.14.2.20 Mon Oct 2 19:42:42 2006
+++ php-src/ext/standard/string.c Mon Oct 2 19:58:15 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.20 2006/10/02 19:42:42 andrei Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.21 2006/10/02 19:58:15 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1768,12 +1768,14 @@
if (offset >= 0) {
if (offset > haystack_len) {
+ php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
RETURN_FALSE;
}
p = haystack + offset;
e = haystack + haystack_len - needle_len;
} else {
if (-offset > haystack_len) {
+ php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
RETURN_FALSE;
}
@@ -1841,12 +1843,17 @@
/* Single character search can shortcut memcmps
Can also avoid tolower emallocs */
if (offset >= 0) {
+ if (offset > haystack_len) {
+ php_error(E_NOTICE, "Offset is greater than the
length of haystack string");
+ RETURN_FALSE;
+ }
p = haystack + offset;
e = haystack + haystack_len - 1;
} else {
p = haystack;
if (-offset > haystack_len) {
- e = haystack + haystack_len - 1;
+ php_error(E_NOTICE, "Offset is greater than the
length of haystack string");
+ RETURN_FALSE;
} else {
e = haystack + haystack_len + offset;
}
@@ -1868,13 +1875,19 @@
php_strtolower(haystack_dup, haystack_len);
if (offset >= 0) {
+ if (offset > haystack_len) {
+ php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ RETURN_FALSE;
+ }
p = haystack_dup + offset;
e = haystack_dup + haystack_len - needle_len;
} else {
- p = haystack_dup;
if (-offset > haystack_len) {
- e = haystack_dup - needle_len;
- } else if (needle_len > -offset) {
+ php_error(E_NOTICE, "Offset is greater than the length
of haystack string");
+ RETURN_FALSE;
+ }
+ p = haystack_dup;
+ if (needle_len > -offset) {
e = haystack_dup + haystack_len - needle_len;
} else {
e = haystack_dup + haystack_len + offset;
--
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) / acinclude.m4
On 02.10.2006 23:17, Antony Dovgal wrote: tony2001Mon Oct 2 19:17:53 2006 UTC Modified files: (Branch: PHP_5_2) /php-src acinclude.m4 Log: fix the fix for #39004 This version of the fix works for me with autoconf 2.60 and other autoconf versions on all systems I can test it on, but *please test* it yourself. Unfortunately I can't test it with all possible shells and autoconf versions, so please make sure the ./config.nice script is generated for you correctly. -- 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/standard string.c
andrei Mon Oct 2 19:42:42 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
Fix invalid memory access in strrpos().
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.19&r2=1.445.2.14.2.20&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.19
php-src/ext/standard/string.c:1.445.2.14.2.20
--- php-src/ext/standard/string.c:1.445.2.14.2.19 Thu Aug 31 14:21:21 2006
+++ php-src/ext/standard/string.c Mon Oct 2 19:42:42 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.19 2006/08/31 14:21:21 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.20 2006/10/02 19:42:42 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1767,13 +1767,18 @@
}
if (offset >= 0) {
+ if (offset > haystack_len) {
+ RETURN_FALSE;
+ }
p = haystack + offset;
e = haystack + haystack_len - needle_len;
} else {
- p = haystack;
if (-offset > haystack_len) {
- e = haystack - needle_len;
- } else if (needle_len > -offset) {
+ RETURN_FALSE;
+ }
+
+ p = haystack;
+ if (needle_len > -offset) {
e = haystack + haystack_len - needle_len;
} else {
e = haystack + haystack_len + offset;
--
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) / acinclude.m4
tony2001Mon Oct 2 19:22:45 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcacinclude.m4 Log: MFH: fix bug #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.218.2.50.2.6&r2=1.218.2.50.2.7&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.218.2.50.2.6 php-src/acinclude.m4:1.218.2.50.2.7 --- php-src/acinclude.m4:1.218.2.50.2.6 Mon Dec 19 22:29:11 2005 +++ php-src/acinclude.m4Mon Oct 2 19:22:45 2006 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.218.2.50.2.6 2005/12/19 22:29:11 sniper Exp $ -*- autoconf -*- +dnl $Id: acinclude.m4,v 1.218.2.50.2.7 2006/10/02 19:22:45 tony2001 Exp $ -*- autoconf -*- dnl dnl This file contains local autoconf functions. @@ -568,8 +568,21 @@ fi done - for arg in [$]0 "[$]@"; do -echo "'[$]arg' \\" >> $1 + echo "'[$]0' \\" >> $1 + for arg in $ac_configure_args; do + if test `expr -- $arg : "'.*"` = 0; then +if test `expr -- $arg : "--.*"` = 0; then + break; +fi +echo "'[$]arg' \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + else +if test `expr -- $arg : "'--.*"` = 0; then + break; +fi +echo "[$]arg \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]arg" + fi done echo '"[$]@"' >> $1 chmod +x $1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / unicode-progress.txt /ext/standard string.c
andrei Mon Oct 2 19:18:14 2006 UTC
Modified files:
/php-src/ext/standard string.c
/php-srcunicode-progress.txt
Log:
- Fix strrpos() logic (which was broken even in PHP 5).
- Optimizations for a couple of functions.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.596&r2=1.597&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.596 php-src/ext/standard/string.c:1.597
--- php-src/ext/standard/string.c:1.596 Mon Oct 2 16:52:22 2006
+++ php-src/ext/standard/string.c Mon Oct 2 19:18:14 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.596 2006/10/02 16:52:22 andrei Exp $ */
+/* $Id: string.c,v 1.597 2006/10/02 19:18:14 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2372,14 +2372,8 @@
php_error(E_WARNING, "Needle argument codepoint
value out of range (0 - 0x10)");
RETURN_FALSE;
}
- if (U_IS_BMP(Z_LVAL_PP(needle))) {
- u_needle_char[needle_len++] =
(UChar)Z_LVAL_PP(needle);
- u_needle_char[needle_len] = 0;
- } else {
- u_needle_char[needle_len++] =
(UChar)U16_LEAD(Z_LVAL_PP(needle));
- u_needle_char[needle_len++] =
(UChar)U16_TRAIL(Z_LVAL_PP(needle));
- u_needle_char[needle_len] = 0;
- }
+ needle_len =
zend_codepoint_to_uchar((UChar32)Z_LVAL_PP(needle), u_needle_char);
+ u_needle_char[needle_len] = 0;
target.u = u_needle_char;
} else {
needle_char[needle_len++] = (char)Z_LVAL_PP(needle);
@@ -2426,7 +2420,7 @@
Finds first occurrence of a string within another */
PHP_FUNCTION(strstr)
{
- void *haystack;
+ zstr haystack;
int haystack_len;
zend_uchar haystack_type;
zval **needle;
@@ -2450,16 +2444,16 @@
/* haystack type determines the needle type */
if (haystack_type == IS_UNICODE) {
convert_to_unicode_ex(needle);
- found = zend_u_memnstr((UChar*)haystack,
+ found = zend_u_memnstr(haystack.u,
Z_USTRVAL_PP(needle),
Z_USTRLEN_PP(needle),
-
(UChar*)haystack + haystack_len);
+ haystack.u +
haystack_len);
} else {
convert_to_string_ex(needle);
- found = php_memnstr((char*)haystack,
+ found = php_memnstr(haystack.s,
Z_STRVAL_PP(needle),
Z_STRLEN_PP(needle),
- (char*)haystack
+ haystack_len);
+ haystack.s +
haystack_len);
}
} else {
convert_to_long_ex(needle);
@@ -2468,39 +2462,33 @@
php_error(E_WARNING, "Needle argument codepoint
value out of range (0 - 0x10)");
RETURN_FALSE;
}
- /* supplementary codepoint values may require 2 UChar's
*/
- if (U_IS_BMP(Z_LVAL_PP(needle))) {
- u_needle_char[n_len++] = (UChar)
Z_LVAL_PP(needle);
- u_needle_char[n_len] = 0;
- } else {
- u_needle_char[n_len++] = (UChar)
U16_LEAD(Z_LVAL_PP(needle));
- u_needle_char[n_len++] = (UChar)
U16_TRAIL(Z_LVAL_PP(needle));
- u_needle_char[n_len] = 0;
- }
- found = zend_u_memnstr((UChar*)haystack,
+ n_len =
zend_codepoint_to_uchar((UChar32)Z_LVAL_PP(needle), u_needle_char);
+ u_needle_char[n_len] = 0;
+
+ found = zend_u_memnstr(haystack.u,
u_needle_char,
n_len,
-
(UChar*)haystack + haystack_len);
+ haystack.u +
haystack_len);
} else
[PHP-CVS] cvs: php-src(PHP_5_2) / acinclude.m4
tony2001Mon Oct 2 19:17:53 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 Log: fix the fix for #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.3&r2=1.332.2.14.2.4&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.3 php-src/acinclude.m4:1.332.2.14.2.4 --- php-src/acinclude.m4:1.332.2.14.2.3 Mon Oct 2 15:34:38 2006 +++ php-src/acinclude.m4Mon Oct 2 19:17:53 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.3 2006/10/02 15:34:38 iliaa Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.4 2006/10/02 19:17:53 tony2001 Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2503,16 +2503,16 @@ fi done - echo "'[$]0'" >> $1 + echo "'[$]0' \\" >> $1 for arg in $ac_configure_args; do - if test `expr substr $arg 1 1` != "'"; then -if test `expr substr $arg 1 2` != '--'; then + if test `expr -- $arg : "'.*"` = 0; then +if test `expr -- $arg : "--.*"` = 0; then break; fi echo "'[$]arg' \\" >> $1 CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" else - if test `expr substr $arg 2 2` != '--'; then +if test `expr -- $arg : "'--.*"` = 0; then break; fi echo "[$]arg \\" >> $1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
tony2001Mon Oct 2 19:17:43 2006 UTC Modified files: /php-srcacinclude.m4 Log: fix the fix for #39004 http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.348&r2=1.349&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.348 php-src/acinclude.m4:1.349 --- php-src/acinclude.m4:1.348 Mon Oct 2 15:34:56 2006 +++ php-src/acinclude.m4Mon Oct 2 19:17:43 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.348 2006/10/02 15:34:56 iliaa Exp $ +dnl $Id: acinclude.m4,v 1.349 2006/10/02 19:17:43 tony2001 Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2503,16 +2503,16 @@ fi done - echo "'[$]0'" >> $1 + echo "'[$]0' \\" >> $1 for arg in $ac_configure_args; do - if test `expr substr $arg 1 1` != "'"; then -if test `expr substr $arg 1 2` != '--'; then + if test `expr -- $arg : "'.*"` = 0; then +if test `expr -- $arg : "--.*"` = 0; then break; fi echo "'[$]arg' \\" >> $1 CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" else - if test `expr substr $arg 2 2` != '--'; then +if test `expr -- $arg : "'--.*"` = 0; then break; fi echo "[$]arg \\" >> $1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
pollita Mon Oct 2 18:14:43 2006 UTC
Modified files:
/php-src/ext/standard dir.c
Log:
Update glob() for PHP6
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.156&r2=1.157&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.156 php-src/ext/standard/dir.c:1.157
--- php-src/ext/standard/dir.c:1.156Mon Oct 2 17:45:30 2006
+++ php-src/ext/standard/dir.c Mon Oct 2 18:14:42 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.156 2006/10/02 17:45:30 pollita Exp $ */
+/* $Id: dir.c,v 1.157 2006/10/02 18:14:42 pollita Exp $ */
/* {{{ includes/startup/misc */
@@ -377,7 +377,7 @@
/* }}} */
#ifdef HAVE_GLOB
-/* {{{ proto array glob(string pattern [, int flags])
+/* {{{ proto array glob(string pattern [, int flags]) U
Find pathnames matching a pattern */
PHP_FUNCTION(glob)
{
@@ -387,6 +387,7 @@
char work_pattern[MAXPATHLEN];
char *result;
#endif
+ zval **pppattern;
char *pattern = NULL;
int pattern_len;
long flags = 0;
@@ -394,8 +395,10 @@
unsigned int n;
int ret;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern,
&pattern_len, &flags) == FAILURE)
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|l", &pppattern,
&flags) == FAILURE ||
+ php_stream_path_param_encode(pppattern, &pattern, &pattern_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
+ }
#ifdef ZTS
if (!IS_ABSOLUTE_PATH(pattern, pattern_len)) {
@@ -469,7 +472,20 @@
continue;
}
}
- add_next_index_rt_string(return_value,
globbuf.gl_pathv[n]+cwd_skip, 1);
+ if (UG(unicode)) {
+ UChar *path;
+ int path_len;
+
+ if (SUCCESS ==
php_stream_path_decode(&php_plain_files_wrapper, &path, &path_len,
globbuf.gl_pathv[n]+cwd_skip,
+
strlen(globbuf.gl_pathv[n]+cwd_skip), REPORT_ERRORS, FG(default_context))) {
+ add_next_index_unicodel(return_value, path,
path_len, 0);
+ } else {
+ /* Fallback on string version, path_decode will
emit warning */
+ add_next_index_string(return_value,
globbuf.gl_pathv[n]+cwd_skip, 1);
+ }
+ } else {
+ add_next_index_string(return_value,
globbuf.gl_pathv[n]+cwd_skip, 1);
+ }
}
globfree(&globbuf);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
pollita Mon Oct 2 18:13:57 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
Unused label, now how the heck did it get there?
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.72&r2=1.73&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.72
php-src/main/streams/plain_wrapper.c:1.73
--- php-src/main/streams/plain_wrapper.c:1.72 Thu Sep 28 07:26:19 2006
+++ php-src/main/streams/plain_wrapper.cMon Oct 2 18:13:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.72 2006/09/28 07:26:19 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.73 2006/10/02 18:13:56 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1276,7 +1276,6 @@
stream = php_stream_fopen_rel(trypath, mode, opened_path,
options);
if (stream) {
-stream_done:
efree(pathbuf);
return stream;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
pollita Mon Oct 2 17:47:02 2006 UTC Modified files: /php-srcNEWS Log: Note context param changes in opendir(), dir(), and scandir() http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2124&r2=1.2125&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2124 php-src/NEWS:1.2125 --- php-src/NEWS:1.2124 Mon Oct 2 03:17:48 2006 +++ php-src/NEWSMon Oct 2 17:47:02 2006 @@ -8,6 +8,8 @@ - Changed return "new" by reference to throw an E_STRICT error. (Dmitry) - Changed "instanceof" and "catch" operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) +- Changed opendir/dir/scandir to use default context + when no context argument is passed. (Sara) - Removed old legacy: . "register_globals" support. (Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c
pollita Mon Oct 2 17:45:30 2006 UTC
Modified files:
/php-src/ext/standard dir.c
Log:
Switch opendir/chroot/chdir to new path_param API and upgrade scandir() for
PHP6
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.155&r2=1.156&diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.155 php-src/ext/standard/dir.c:1.156
--- php-src/ext/standard/dir.c:1.155Sat Sep 23 12:32:32 2006
+++ php-src/ext/standard/dir.c Mon Oct 2 17:45:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.155 2006/09/23 12:32:32 tony2001 Exp $ */
+/* $Id: dir.c,v 1.156 2006/10/02 17:45:30 pollita Exp $ */
/* {{{ includes/startup/misc */
@@ -178,36 +178,32 @@
/* {{{ internal functions */
static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
{
- UChar *udir;
+ zval **ppdir;
+ UChar *udir = NULL;
char *dir;
int dir_len, udir_len;
- zend_uchar dir_type;
zval *zcontext = NULL;
php_stream_context *context = NULL;
php_stream *dirp;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|r", &dir,
&dir_len, &dir_type, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|r", &ppdir,
&zcontext) == FAILURE) {
return;
}
RETVAL_FALSE;
- /* Save for later */
- udir = (UChar*)dir;
- udir_len = dir_len;
-
- if (zcontext) {
- context = php_stream_context_from_zval(zcontext, 0);
+ if (createobject && Z_TYPE_PP(ppdir) == IS_UNICODE) {
+ /* Save for later */
+ udir = eustrndup(Z_USTRVAL_PP(ppdir), Z_USTRLEN_PP(ppdir));
+ udir_len = Z_USTRLEN_PP(ppdir);
}
- if (dir_type == IS_UNICODE) {
- if (FAILURE == php_stream_path_encode(NULL, &dir, &dir_len,
udir, udir_len, REPORT_ERRORS, context)) {
- goto opendir_cleanup;
- }
+ context = php_stream_context_from_zval(zcontext, 0);
+ if (FAILURE == php_stream_path_param_encode(ppdir, &dir, &dir_len,
REPORT_ERRORS, context)) {
+ goto opendir_cleanup;
}
dirp = php_stream_opendir(dir, REPORT_ERRORS, context);
-
if (dirp == NULL) {
goto opendir_cleanup;
}
@@ -216,8 +212,11 @@
if (createobject) {
object_init_ex(return_value, dir_class_entry_ptr);
- if (dir_type == IS_UNICODE) {
- add_property_unicodel(return_value, "path", udir,
udir_len, 1);
+ if (udir) {
+ add_property_unicodel(return_value, "path", udir,
udir_len, 0);
+
+ /* Avoid auto-cleanup */
+ udir = NULL;
} else {
add_property_stringl(return_value, "path", dir,
dir_len, 1);
}
@@ -228,8 +227,8 @@
}
opendir_cleanup:
- if (dir_type == IS_UNICODE) {
- efree(dir);
+ if (udir) {
+ efree(udir);
}
}
/* }}} */
@@ -272,25 +271,16 @@
Change root directory */
PHP_FUNCTION(chroot)
{
+ zval **ppstr;
char *str;
int ret, str_len;
- zend_uchar str_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &str,
&str_len, &str_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &ppstr) ==
FAILURE ||
+ php_stream_path_param_encode(ppstr, &str, &str_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
}
-
- if (str_type == IS_UNICODE) {
- if (FAILURE == php_stream_path_encode(NULL, &str, &str_len,
(UChar*)str, str_len, REPORT_ERRORS, FG(default_context))) {
- RETURN_FALSE;
- }
- }
ret = chroot(str);
- if (str_type == IS_UNICODE) {
- efree(str);
- }
-
if (ret != 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s (errno %d)",
strerror(errno), errno);
RETURN_FALSE;
@@ -312,25 +302,16 @@
Change the current directory */
PHP_FUNCTION(chdir)
{
+ zval **ppstr;
char *str;
int ret, str_len;
- zend_uchar str_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &str,
&str_len, &str_type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &ppstr) ==
FAILURE ||
+ php_stream_path_param_encode(ppstr, &str, &str_len,
REPORT_ERRORS, FG(default_context)) == FAILURE) {
return;
}
- if (str_type == IS_UNICODE) {
- if (FAILURE == php_stream_path_encode(NULL, &str, &str_len,
(UChar*)str, str_len, REPORT_ERRORS, FG(default_context))) {
-
[PHP-CVS] cvs: php-src / unicode-progress.txt /ext/standard string.c
andrei Mon Oct 2 16:52:22 2006 UTC
Modified files:
/php-srcunicode-progress.txt
/php-src/ext/standard string.c
Log:
Make stripos() work with Unicode strings.
http://cvs.php.net/viewvc.cgi/php-src/unicode-progress.txt?r1=1.50&r2=1.51&diff_format=u
Index: php-src/unicode-progress.txt
diff -u php-src/unicode-progress.txt:1.50 php-src/unicode-progress.txt:1.51
--- php-src/unicode-progress.txt:1.50 Fri Sep 22 19:35:05 2006
+++ php-src/unicode-progress.txtMon Oct 2 16:52:21 2006
@@ -27,7 +27,6 @@
Params API. Rest - no idea yet.
stristr()
-stripos()
strripos()
str_replace()
stri_replace()
@@ -158,6 +157,7 @@
strip_tags()
stripcslashes()
stripslashes()
+stripos()
strpbrk()
strpos()
strrchr()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.595&r2=1.596&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.595 php-src/ext/standard/string.c:1.596
--- php-src/ext/standard/string.c:1.595 Mon Oct 2 01:11:04 2006
+++ php-src/ext/standard/string.c Mon Oct 2 16:52:22 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.595 2006/10/02 01:11:04 pollita Exp $ */
+/* $Id: string.c,v 1.596 2006/10/02 16:52:22 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2625,7 +2625,7 @@
}
/* }}} */
-/* {{{ proto int stripos(string haystack, string needle [, int offset])
+/* {{{ proto int stripos(string haystack, string needle [, int offset]) U
Finds position of first occurrence of a string within another, case
insensitive */
PHP_FUNCTION(stripos)
{
@@ -2633,12 +2633,12 @@
long offset = 0;
int haystack_len, needle_len = 0;
zend_uchar str_type;
- void *haystack_dup, *needle_dup = NULL;
+ void *haystack_dup = NULL, *needle_dup = NULL;
char needle_char[2];
char c = 0;
- UChar u_needle_char[3];
- UChar32 ch = 0;
+ UChar u_needle_char[8];
void *found = NULL;
+ int cu_offset = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZ|l", &haystack,
&needle, &offset) == FAILURE) {
return;
@@ -2662,6 +2662,7 @@
if (!Z_UNILEN_PP(needle) || Z_UNILEN_PP(needle) > haystack_len)
{
RETURN_FALSE;
}
+ /* convert both strings to the same type */
if (Z_TYPE_PP(haystack) != Z_TYPE_PP(needle)) {
str_type = zend_get_unified_string_type(2 TSRMLS_CC,
Z_TYPE_PP(haystack), Z_TYPE_PP(needle));
convert_to_explicit_type_ex(haystack, str_type);
@@ -2669,11 +2670,9 @@
}
needle_len = Z_UNILEN_PP(needle);
if (Z_TYPE_PP(haystack) == IS_UNICODE) {
- haystack_dup = php_u_strtolower(Z_USTRVAL_PP(haystack),
&haystack_len, UG(default_locale));
- needle_dup = php_u_strtolower(Z_USTRVAL_PP(needle),
&needle_len, UG(default_locale));
- found = zend_u_memnstr((UChar *)haystack_dup + offset,
- (UChar
*)needle_dup, needle_len,
- (UChar
*)haystack_dup + haystack_len);
+ /* calculate codeunit offset */
+ U16_FWD_N(Z_USTRVAL_PP(haystack), cu_offset,
haystack_len, offset);
+ found = php_u_stristr(Z_USTRVAL_PP(haystack) +
cu_offset, Z_USTRVAL_PP(needle), haystack_len, needle_len TSRMLS_CC);
} else {
haystack_dup = estrndup(Z_STRVAL_PP(haystack),
haystack_len);
php_strtolower((char *)haystack_dup, haystack_len);
@@ -2688,14 +2687,22 @@
case IS_LONG:
case IS_BOOL:
if (Z_TYPE_PP(haystack) == IS_UNICODE) {
- ch =
u_tolower((UChar32)Z_LVAL_PP(needle));
+ if (Z_LVAL_PP(needle) < 0 ||
Z_LVAL_PP(needle) > 0x10) {
+ php_error(E_WARNING, "Needle
argument codepoint value out of range (0 - 0x10)");
+ RETURN_FALSE;
+ }
+ needle_len =
zend_codepoint_to_uchar((UChar32)Z_LVAL_PP(needle), u_needle_char);
} else {
c = tolower((char)Z_LVAL_PP(needle));
}
break;
case IS_DOUBLE:
if (Z_TYPE_PP(haystack) == IS_UNICODE) {
-
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqli/tests 068.phpt
On 02.10.2006 19:48, Andrei Zmievski wrote: Great! So, has anyone tested or played around with the mysqli extension after these updates? It passes all the tests for me (in both native and Unicode modes), even with -m. -- 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 /ext/mysqli mysqli_api.c
tony2001Mon Oct 2 16:08:11 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
don't rely on uninitialized var
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.135&r2=1.136&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.135
php-src/ext/mysqli/mysqli_api.c:1.136
--- php-src/ext/mysqli/mysqli_api.c:1.135 Mon Oct 2 07:42:49 2006
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 2 16:08:11 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.135 2006/10/02 07:42:49 bjori Exp $
+ $Id: mysqli_api.c,v 1.136 2006/10/02 16:08:11 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1415,7 +1415,7 @@
{
MY_MYSQL*mysql;
char*hostname, *username, *passwd, *dbname, *socket;
- int hostname_len, username_len, passwd_len,
dbname_len, socket_len;
+ int hostname_len, username_len, passwd_len,
dbname_len, socket_len = 0;
unsigned long port=0, flags=0;
zval*mysql_link;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqli/tests 068.phpt
Great! So, has anyone tested or played around with the mysqli extension after these updates? -Andrei On Oct 1, 2006, at 2:01 PM, Georg Richter wrote: georg Sun Oct 1 21:01:31 2006 UTC Modified files: /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /php-src/ext/mysqli/tests 068.phpt Log: unicode fixes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
iliaa Mon Oct 2 15:34:57 2006 UTC Modified files: /php-srcacinclude.m4 Log: MFB: Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60). http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.347&r2=1.348&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.347 php-src/acinclude.m4:1.348 --- php-src/acinclude.m4:1.347 Fri Jun 16 08:00:23 2006 +++ php-src/acinclude.m4Mon Oct 2 15:34:56 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.347 2006/06/16 08:00:23 sesser Exp $ +dnl $Id: acinclude.m4,v 1.348 2006/10/02 15:34:56 iliaa Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2503,9 +2503,21 @@ fi done - for arg in [$]0 "[$]@"; do -echo "'[$]arg' \\" >> $1 -CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + echo "'[$]0'" >> $1 + for arg in $ac_configure_args; do + if test `expr substr $arg 1 1` != "'"; then +if test `expr substr $arg 1 2` != '--'; then + break; +fi +echo "'[$]arg' \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + else + if test `expr substr $arg 2 2` != '--'; then + break; +fi +echo "[$]arg \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]arg" + fi done echo '"[$]@"' >> $1 chmod +x $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) / NEWS acinclude.m4
iliaa Mon Oct 2 15:34:38 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 NEWS Log: Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60). http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.2&r2=1.332.2.14.2.3&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.2 php-src/acinclude.m4:1.332.2.14.2.3 --- php-src/acinclude.m4:1.332.2.14.2.2 Fri Jun 16 08:01:03 2006 +++ php-src/acinclude.m4Mon Oct 2 15:34:38 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.2 2006/06/16 08:01:03 sesser Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.3 2006/10/02 15:34:38 iliaa Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -2503,9 +2503,21 @@ fi done - for arg in [$]0 "[$]@"; do -echo "'[$]arg' \\" >> $1 -CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + echo "'[$]0'" >> $1 + for arg in $ac_configure_args; do + if test `expr substr $arg 1 1` != "'"; then +if test `expr substr $arg 1 2` != '--'; then + break; +fi +echo "'[$]arg' \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]arg'" + else + if test `expr substr $arg 2 2` != '--'; then + break; +fi +echo "[$]arg \\" >> $1 +CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]arg" + fi done echo '"[$]@"' >> $1 chmod +x $1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.276&r2=1.2027.2.547.2.277&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.276 php-src/NEWS:1.2027.2.547.2.277 --- php-src/NEWS:1.2027.2.547.2.276 Mon Oct 2 12:16:35 2006 +++ php-src/NEWSMon Oct 2 15:34:38 2006 @@ -6,6 +6,8 @@ - Fixed mess with CGI/CLI -d option (now it works with cgi; constants are working exactly like in php.ini; with FastCGI -d affects all requests). (Dmitry) +- Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60). + (Ilia) - Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony) - Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for protected properties). (Tony) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.m4
hirokawaMon Oct 2 15:32:48 2006 UTC Modified files: /php-src/ext/mbstring config.m4 Log: fixed bug #37103: libmbfl headers was not installed correctly. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.62&r2=1.63&diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.62 php-src/ext/mbstring/config.m4:1.63 --- php-src/ext/mbstring/config.m4:1.62 Mon Apr 17 22:13:39 2006 +++ php-src/ext/mbstring/config.m4 Mon Oct 2 15:32:48 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.62 2006/04/17 22:13:39 sniper Exp $ +dnl $Id: config.m4,v 1.63 2006/10/02 15:32:48 hirokawa Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -283,7 +283,7 @@ dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION - PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl]) + PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h php_mbregex.h libmbfl/ libmbfl/mbfl/ oniguruma/]) fi # vim600: sts=2 sw=2 et -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/tests bug7658.phpt oo_addfile.phpt oo_namelocate.phpt oo_rename.phpt
tony2001Mon Oct 2 14:31:32 2006 UTC
Modified files:
/php-src/ext/zip/tests bug7658.phpt oo_addfile.phpt
oo_namelocate.phpt oo_rename.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug7658.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zip/tests/bug7658.phpt
diff -u php-src/ext/zip/tests/bug7658.phpt:1.1
php-src/ext/zip/tests/bug7658.phpt:1.2
--- php-src/ext/zip/tests/bug7658.phpt:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/bug7658.phpt Mon Oct 2 14:31:32 2006
@@ -2,13 +2,13 @@
bug #7658, modify archive with general bit flag 3 set
--SKIPIF--
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_addfile.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zip/tests/oo_addfile.phpt
diff -u php-src/ext/zip/tests/oo_addfile.phpt:1.1
php-src/ext/zip/tests/oo_addfile.phpt:1.2
--- php-src/ext/zip/tests/oo_addfile.phpt:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/oo_addfile.phpt Mon Oct 2 14:31:32 2006
@@ -2,14 +2,14 @@
ziparchive::addFile() function
--SKIPIF--
--FILE--
open($file)) {
exit('failed');
}
-if (!$zip->addFile($dirname . 'utils.php', 'test.php')) {
+if (!$zip->addFile($dirname . 'utils.inc', 'test.php')) {
echo "failed\n";
}
if ($zip->status == ZIPARCHIVE::ER_OK) {
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_namelocate.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/zip/tests/oo_namelocate.phpt
diff -u php-src/ext/zip/tests/oo_namelocate.phpt:1.2
php-src/ext/zip/tests/oo_namelocate.phpt:1.3
--- php-src/ext/zip/tests/oo_namelocate.phpt:1.2Sun Aug 13 23:39:57 2006
+++ php-src/ext/zip/tests/oo_namelocate.phptMon Oct 2 14:31:32 2006
@@ -2,13 +2,13 @@
Locate entries by name
--SKIPIF--
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_rename.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zip/tests/oo_rename.phpt
diff -u php-src/ext/zip/tests/oo_rename.phpt:1.1
php-src/ext/zip/tests/oo_rename.phpt:1.2
--- php-src/ext/zip/tests/oo_rename.phpt:1.1Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/oo_rename.phptMon Oct 2 14:31:32 2006
@@ -2,13 +2,13 @@
Rename entries
--SKIPIF--
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip/tests bug7658.phpt oo_addfile.phpt oo_namelocate.phpt oo_rename.phpt
tony2001Mon Oct 2 14:31:04 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zip/tests bug7658.phpt oo_addfile.phpt
oo_namelocate.phpt oo_rename.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug7658.phpt?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/zip/tests/bug7658.phpt
diff -u php-src/ext/zip/tests/bug7658.phpt:1.1
php-src/ext/zip/tests/bug7658.phpt:1.1.2.1
--- php-src/ext/zip/tests/bug7658.phpt:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/bug7658.phpt Mon Oct 2 14:31:04 2006
@@ -2,13 +2,13 @@
bug #7658, modify archive with general bit flag 3 set
--SKIPIF--
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_addfile.phpt?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/zip/tests/oo_addfile.phpt
diff -u php-src/ext/zip/tests/oo_addfile.phpt:1.1
php-src/ext/zip/tests/oo_addfile.phpt:1.1.2.1
--- php-src/ext/zip/tests/oo_addfile.phpt:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/oo_addfile.phpt Mon Oct 2 14:31:04 2006
@@ -2,14 +2,14 @@
ziparchive::addFile() function
--SKIPIF--
--FILE--
open($file)) {
exit('failed');
}
-if (!$zip->addFile($dirname . 'utils.php', 'test.php')) {
+if (!$zip->addFile($dirname . 'utils.inc', 'test.php')) {
echo "failed\n";
}
if ($zip->status == ZIPARCHIVE::ER_OK) {
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_namelocate.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/zip/tests/oo_namelocate.phpt
diff -u php-src/ext/zip/tests/oo_namelocate.phpt:1.1.2.1
php-src/ext/zip/tests/oo_namelocate.phpt:1.1.2.2
--- php-src/ext/zip/tests/oo_namelocate.phpt:1.1.2.1Sun Aug 13 23:43:11 2006
+++ php-src/ext/zip/tests/oo_namelocate.phptMon Oct 2 14:31:04 2006
@@ -2,13 +2,13 @@
Locate entries by name
--SKIPIF--
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/oo_rename.phpt?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/zip/tests/oo_rename.phpt
diff -u php-src/ext/zip/tests/oo_rename.phpt:1.1
php-src/ext/zip/tests/oo_rename.phpt:1.1.2.1
--- php-src/ext/zip/tests/oo_rename.phpt:1.1Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/tests/oo_rename.phptMon Oct 2 14:31:04 2006
@@ -2,13 +2,13 @@
Rename entries
--SKIPIF--
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip/tests utils.inc utils.php
bjori Mon Oct 2 14:17:47 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/zip/tests utils.inc
Removed files:
/php-src/ext/zip/tests utils.php
Log:
Rename utils.php to utils.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/utils.inc?view=markup&rev=1.1
Index: php-src/ext/zip/tests/utils.inc
+++ php-src/ext/zip/tests/utils.inc
numFiles; $i++) {
$sb = $z->statIndex($i);
echo $i . ' ' . $sb['name'] . "\n";
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/tests utils.inc utils.php
bjori Mon Oct 2 14:17:42 2006 UTC
Added files:
/php-src/ext/zip/tests utils.inc
Removed files:
/php-src/ext/zip/tests utils.php
Log:
Rename utils.php to utils.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/utils.inc?view=markup&rev=1.1
Index: php-src/ext/zip/tests/utils.inc
+++ php-src/ext/zip/tests/utils.inc
numFiles; $i++) {
$sb = $z->statIndex($i);
echo $i . ' ' . $sb['name'] . "\n";
}
}
--
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) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests bug39001.phpt
tony2001Mon Oct 2 12:16:35 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests bug39001.phpt
Modified files:
/php-srcNEWS
/php-src/ext/reflection php_reflection.c
Log:
MFH: #39001 (ReflectionProperty returns incorrect declaring class for
protected properties)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.275&r2=1.2027.2.547.2.276&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.275 php-src/NEWS:1.2027.2.547.2.276
--- php-src/NEWS:1.2027.2.547.2.275 Mon Oct 2 11:09:52 2006
+++ php-src/NEWSMon Oct 2 12:16:35 2006
@@ -7,6 +7,8 @@
working exactly like in php.ini; with FastCGI -d affects all requests).
(Dmitry)
- Fixed bug #39003 (__autoload() is called for type hinting). (Dmitry, Tony)
+- Fixed bug #39001 (ReflectionProperty returns incorrect declaring class for
+ protected properties). (Tony)
- Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
session.save_path, allowing them to account for extra parameters). (Ilia)
- Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.25&r2=1.164.2.33.2.26&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.25
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.26
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.25 Tue Sep 26
07:55:20 2006
+++ php-src/ext/reflection/php_reflection.c Mon Oct 2 12:16:35 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.25 2006/09/26 07:55:20 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.26 2006/10/02 12:16:35 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4008,14 +4008,21 @@
property_reference *ref;
zend_class_entry *tmp_ce, *ce;
zend_property_info *tmp_info;
+ char *prop_name, *class_name;
+ int prop_name_len;
METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ref);
+ if (zend_unmangle_property_name(ref->prop->name,
ref->prop->name_length, &class_name, &prop_name) != SUCCESS) {
+ RETURN_FALSE;
+ }
+
+ prop_name_len = strlen(prop_name);
ce = tmp_ce = ref->ce;
- while (tmp_ce && zend_hash_find(&tmp_ce->properties_info,
ref->prop->name, ref->prop->name_length + 1, (void **) &tmp_info) == SUCCESS) {
+ while (tmp_ce && zend_hash_find(&tmp_ce->properties_info, prop_name,
prop_name_len + 1, (void **) &tmp_info) == SUCCESS) {
ce = tmp_ce;
-tmp_ce = tmp_ce->parent;
+ tmp_ce = tmp_ce->parent;
}
zend_reflection_class_factory(ce, return_value TSRMLS_CC);
@@ -4827,7 +4834,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.25 2006/09/26 07:55:20 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.26 2006/10/02 12:16:35 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39001.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug39001.phpt
+++ php-src/ext/reflection/tests/bug39001.phpt
--TEST--
Bug #39001 (ReflectionProperty returns incorrect declaring class for protected
properties)
--FILE--
getProperty('publicVar')->getDeclaringClass()->getName());
var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName());
echo "Done\n";
?>
--EXPECTF--
string(7) "CParent"
string(7) "CParent"
Done
--UEXPECTF--
unicode(7) "CParent"
unicode(7) "CParent"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug39001.phpt
tony2001Mon Oct 2 12:15:47 2006 UTC
Added files:
/php-src/ext/reflection/tests bug39001.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
fix #39001 (ReflectionProperty returns incorrect declaring class for
protected properties)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.256&r2=1.257&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.256
php-src/ext/reflection/php_reflection.c:1.257
--- php-src/ext/reflection/php_reflection.c:1.256 Tue Sep 26 07:55:54 2006
+++ php-src/ext/reflection/php_reflection.c Mon Oct 2 12:15:47 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.256 2006/09/26 07:55:54 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.257 2006/10/02 12:15:47 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -4080,12 +4080,19 @@
property_reference *ref;
zend_class_entry *tmp_ce, *ce;
zend_property_info *tmp_info;
+ zstr prop_name, class_name;
+ int prop_name_len;
METHOD_NOTSTATIC_NUMPARAMS(reflection_property_ptr, 0);
GET_REFLECTION_OBJECT_PTR(ref);
+ if (zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING,
ref->prop->name, ref->prop->name_length, &class_name, &prop_name) != SUCCESS) {
+ RETURN_FALSE;
+ }
+
+ prop_name_len = USTR_LEN(prop_name);
ce = tmp_ce = ref->ce;
- while (tmp_ce && zend_u_hash_find(&tmp_ce->properties_info,
UG(unicode)?IS_UNICODE:IS_STRING, ref->prop->name, ref->prop->name_length + 1,
(void **) &tmp_info) == SUCCESS) {
+ while (tmp_ce && zend_u_hash_find(&tmp_ce->properties_info,
UG(unicode)?IS_UNICODE:IS_STRING, prop_name, prop_name_len + 1, (void **)
&tmp_info) == SUCCESS) {
ce = tmp_ce;
tmp_ce = tmp_ce->parent;
}
@@ -4896,7 +4903,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.256
2006/09/26 07:55:54 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.257
2006/10/02 12:15:47 tony2001 Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug39001.phpt?view=markup&rev=1.1
Index: php-src/ext/reflection/tests/bug39001.phpt
+++ php-src/ext/reflection/tests/bug39001.phpt
--TEST--
Bug #39001 (ReflectionProperty returns incorrect declaring class for protected
properties)
--FILE--
getProperty('publicVar')->getDeclaringClass()->getName());
var_dump($r->getProperty('protectedVar')->getDeclaringClass()->getName());
echo "Done\n";
?>
--EXPECTF--
string(7) "CParent"
string(7) "CParent"
Done
--UEXPECTF--
unicode(7) "CParent"
unicode(7) "CParent"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes type_hinting_002.phpt ZendEngine2 zend_execute.c ZendEngine2/tests bug39003.phpt
tony2001Mon Oct 2 11:05:02 2006 UTC
Added files:
/ZendEngine2/tests bug39003.phpt
Modified files:
/ZendEngine2zend_execute.c
/php-src/tests/classes type_hinting_002.phpt
Log:
fix #39003 (__autoload() is called for type hinting)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.751&r2=1.752&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.751 ZendEngine2/zend_execute.c:1.752
--- ZendEngine2/zend_execute.c:1.751Wed Aug 30 09:58:10 2006
+++ ZendEngine2/zend_execute.c Mon Oct 2 11:05:02 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute.c,v 1.751 2006/08/30 09:58:10 tony2001 Exp $ */
+/* $Id: zend_execute.c,v 1.752 2006/10/02 11:05:02 tony2001 Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -472,11 +472,12 @@
}
}
-static inline char * zend_verify_arg_class_kind(zend_arg_info *cur_arg_info,
zend_class_entry **pce TSRMLS_DC)
+static inline char * zend_verify_arg_class_kind(zend_arg_info *cur_arg_info,
zstr *class_name, zend_class_entry **pce TSRMLS_DC)
{
- *pce = zend_u_fetch_class(UG(unicode) ? IS_UNICODE : IS_STRING,
cur_arg_info->class_name, cur_arg_info->class_name_len, ZEND_FETCH_CLASS_AUTO
TSRMLS_CC);
+ *pce = zend_u_fetch_class(UG(unicode) ? IS_UNICODE : IS_STRING,
cur_arg_info->class_name, cur_arg_info->class_name_len, (ZEND_FETCH_CLASS_AUTO
| ZEND_FETCH_CLASS_NO_AUTOLOAD) TSRMLS_CC);
- if ((*pce)->ce_flags & ZEND_ACC_INTERFACE) {
+ *class_name = (*pce) ? (*pce)->name: cur_arg_info->class_name;
+ if (*pce && (*pce)->ce_flags & ZEND_ACC_INTERFACE) {
return "implement interface ";
} else {
return "be an instance of ";
@@ -518,21 +519,22 @@
}
cur_arg_info = &zf->common.arg_info[arg_num-1];
+if (cur_arg_info->class_name.v) {
+zstr class_name;
- if (cur_arg_info->class_name.v) {
- if (!arg) {
- need_msg = zend_verify_arg_class_kind(cur_arg_info, &ce
TSRMLS_CC);
- return zend_verify_arg_error(zf, arg_num, cur_arg_info,
need_msg, ce->name, "none", EMPTY_ZSTR TSRMLS_CC);
- }
- if (Z_TYPE_P(arg) == IS_OBJECT) {
- need_msg = zend_verify_arg_class_kind(cur_arg_info, &ce
TSRMLS_CC);
- if (!instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC))
{
- return zend_verify_arg_error(zf, arg_num,
cur_arg_info, need_msg, ce->name, "instance of ", Z_OBJCE_P(arg)->name
TSRMLS_CC);
- }
- } else if (Z_TYPE_P(arg) != IS_NULL ||
!cur_arg_info->allow_null) {
- need_msg = zend_verify_arg_class_kind(cur_arg_info, &ce
TSRMLS_CC);
- return zend_verify_arg_error(zf, arg_num, cur_arg_info,
need_msg, ce->name, zend_zval_type_name(arg), EMPTY_ZSTR TSRMLS_CC);
- }
+if (!arg) {
+need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name,
&ce TSRMLS_CC);
+return zend_verify_arg_error(zf, arg_num, cur_arg_info, need_msg,
class_name, "none", EMPTY_ZSTR TSRMLS_CC);
+}
+if (Z_TYPE_P(arg) == IS_OBJECT) {
+need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name,
&ce TSRMLS_CC);
+if (!ce || !instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
+return zend_verify_arg_error(zf, arg_num, cur_arg_info,
need_msg, class_name, "instance of ", Z_OBJCE_P(arg)->name TSRMLS_CC);
+}
+} else if (Z_TYPE_P(arg) != IS_NULL || !cur_arg_info->allow_null) {
+need_msg = zend_verify_arg_class_kind(cur_arg_info, &class_name,
&ce TSRMLS_CC);
+return zend_verify_arg_error(zf, arg_num, cur_arg_info, need_msg,
class_name, zend_zval_type_name(arg), EMPTY_ZSTR TSRMLS_CC);
+}
} else if (cur_arg_info->array_type_hint) {
if (!arg) {
return zend_verify_arg_error(zf, arg_num, cur_arg_info,
"be an array", EMPTY_ZSTR, "none", EMPTY_ZSTR TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/type_hinting_002.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/tests/classes/type_hinting_002.phpt
diff -u php-src/tests/classes/type_hinting_002.phpt:1.1
php-src/tests/classes/type_hinting_002.phpt:1.2
--- php-src/tests/classes/type_hinting_002.phpt:1.1 Sat Mar 27 15:49:23 2004
+++ php-src/tests/classes/type_hinting_002.phpt Mon Oct 2 11:05:02 2006
@@ -13,5 +13,4 @@
$o->a($o);
?>
--EXPECTF--
-
-Fatal error: Class 'NonExisting' not found in %stype_hinting_002.php on line %d
+Catchable fatal error: Argument 1 passed to Foo::a() must be an instance of
NonExisting, instance of Foo given, called in %s on line %d and defined in %s
on line %d
http://cvs.php.net/viewvc.cgi/
[PHP-CVS] cvs: CVSROOT / avail
mj Mon Oct 2 09:47:13 2006 UTC Modified files: /CVSROOTavail Log: * pear/Crypt_XXTEA for Wudi. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1187&r2=1.1188&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1187 CVSROOT/avail:1.1188 --- CVSROOT/avail:1.1187Fri Sep 29 06:50:35 2006 +++ CVSROOT/avail Mon Oct 2 09:47:13 2006 @@ -356,6 +356,7 @@ avail|squiz|pear/PHP_CodeSniffer,peardoc avail|shomas|pear/HTML_TagCloud,peardoc avail|nandika|pecl/axis2 +avail|wudicgi|pear/Crypt_XXTEA,peardoc # php windows installer avail|jmertic|php-src/win32/installer -- 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 config.m4
On 01.10.2006 12:34, Rui Hirokawa wrote: hirokawaSun Oct 1 08:34:39 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mbstring config.m4 Log: fixed bug #37103: libmbfl headers was not installed correctly. Please don't forget to merge this patch into HEAD. Thanks. -- 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/reflection/tests bug38942.phpt
bjori Mon Oct 2 08:36:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests bug38942.phpt
Log:
Fix test
#failes atm...
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug38942.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/reflection/tests/bug38942.phpt
diff -u php-src/ext/reflection/tests/bug38942.phpt:1.1.2.1
php-src/ext/reflection/tests/bug38942.phpt:1.1.2.2
--- php-src/ext/reflection/tests/bug38942.phpt:1.1.2.1 Tue Sep 26 07:55:21 2006
+++ php-src/ext/reflection/tests/bug38942.phpt Mon Oct 2 08:36:35 2006
@@ -26,7 +26,7 @@
- Properties [0] {
}
- - Methods [2] {
+ - Methods [1] {
Method [ public method foo ] {
@@ %sbug38942.php 3 - 3
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests bug38942.phpt
bjori Mon Oct 2 08:35:43 2006 UTC
Modified files:
/php-src/ext/reflection/tests bug38942.phpt
Log:
Fix test
# failes atm though
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug38942.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/reflection/tests/bug38942.phpt
diff -u php-src/ext/reflection/tests/bug38942.phpt:1.2
php-src/ext/reflection/tests/bug38942.phpt:1.3
--- php-src/ext/reflection/tests/bug38942.phpt:1.2 Tue Sep 26 07:55:54 2006
+++ php-src/ext/reflection/tests/bug38942.phpt Mon Oct 2 08:35:43 2006
@@ -26,7 +26,7 @@
- Properties [0] {
}
- - Methods [2] {
+ - Methods [1] {
Method [ public method foo ] {
@@ %sbug38942.php 3 - 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_2) /ext/zip/tests .cvsignore
bjori Mon Oct 2 07:59:45 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/zip/tests .cvsignore Log: Initial commit.. http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/.cvsignore?view=markup&rev=1.1 Index: php-src/ext/zip/tests/.cvsignore +++ php-src/ext/zip/tests/.cvsignore *.exp *.out *.php phpt.* -- 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/posix posix.c /ext/standard basic_functions.c html.c /ext/tidy tidy.c
bjori Mon Oct 2 07:58:14 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/posix posix.c
/php-src/ext/tidy tidy.c
/php-src/ext/standard basic_functions.c html.c
Log:
protos
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.5&r2=1.70.2.3.2.6&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.5
php-src/ext/posix/posix.c:1.70.2.3.2.6
--- php-src/ext/posix/posix.c:1.70.2.3.2.5 Sat Sep 16 17:41:57 2006
+++ php-src/ext/posix/posix.c Mon Oct 2 07:58:13 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.70.2.3.2.5 2006/09/16 17:41:57 nlopess Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.6 2006/10/02 07:58:13 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.5 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.6 $");
php_info_print_table_end();
}
/* }}} */
@@ -1064,7 +1064,7 @@
#endif
#ifdef HAVE_INITGROUPS
-/* {{{ proto bool initgroups(string name, int base_group_id)
+/* {{{ proto bool posix_initgroups(string name, int base_group_id)
Calculate the group access list for the user specified in name. */
PHP_FUNCTION(posix_initgroups)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.14&r2=1.66.2.8.2.15&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.14
php-src/ext/tidy/tidy.c:1.66.2.8.2.15
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.14 Fri Sep 15 14:57:52 2006
+++ php-src/ext/tidy/tidy.c Mon Oct 2 07:58:13 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.14 2006/09/15 14:57:52 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -988,7 +988,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.14 2006/09/15 14:57:52
nlopess Exp $)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.66.2.8.2.15 2006/10/02 07:58:13
bjori Exp $)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1312,7 +1312,7 @@
}
/* }}} */
-/* {{{ proto boolean tidy_is_xhtml()
+/* {{{ proto boolean tidy_is_xml()
Indicates if the document is a generic (non HTML/XHTML) XML document. */
static PHP_FUNCTION(tidy_is_xml)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.26&r2=1.725.2.31.2.27&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.26
php-src/ext/standard/basic_functions.c:1.725.2.31.2.27
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.26 Sun Oct 1
20:58:02 2006
+++ php-src/ext/standard/basic_functions.c Mon Oct 2 07:58:13 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.26 2006/10/01 20:58:02 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.27 2006/10/02 07:58:13 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6295,6 +6295,8 @@
/* }}} */
#ifdef HAVE_GETLOADAVG
+/* {{{ proto array sys_getloadavg()
+ */
PHP_FUNCTION(sys_getloadavg)
{
double load[3];
@@ -6308,6 +6310,7 @@
add_index_double(return_value, 2, load[2]);
}
}
+/* }}} */
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.1&r2=1.111.2.2.2.2&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.1
php-src/ext/standard/html.c:1.111.2.2.2.2
--- php-src/ext/standard/html.c:1.111.2.2.2.1 Tue Aug 15 15:09:38 2006
+++ php-src/ext/standard/html.c Mon Oct 2 07:58:13 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.111.2.2.2.1 2006/08/15 15:09:38 tony2001 Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.2 2006/10/02 07:58:13 bjori Exp $ */
/*
* HTML entity resources:
@@ -1221,7 +1221,7 @@
}
/* }}} */
-/* {{{ proto string htmlspecialchars(string string [, int quote_style])
+/* {{{ proto string htmlspecialchars_decode(string string [, int quote_style])
Convert special HTML entities back to characters */
PHP_FUNCTION(htmlspecialchars_decode)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/posix posix.c /ext/standard basic_functions.c html.c /ext/tidy tidy.c
bjori Mon Oct 2 07:54:37 2006 UTC
Modified files:
/php-src/ext/posix posix.c
/php-src/ext/tidy tidy.c
/php-src/ext/standard basic_functions.c html.c
Log:
Protos
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.79&r2=1.80&diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.79 php-src/ext/posix/posix.c:1.80
--- php-src/ext/posix/posix.c:1.79 Sat Sep 16 17:42:44 2006
+++ php-src/ext/posix/posix.c Mon Oct 2 07:54:37 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.79 2006/09/16 17:42:44 nlopess Exp $ */
+/* $Id: posix.c,v 1.80 2006/10/02 07:54:37 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -147,7 +147,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.79 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.80 $");
php_info_print_table_end();
}
/* }}} */
@@ -1058,7 +1058,7 @@
#endif
#ifdef HAVE_INITGROUPS
-/* {{{ proto bool initgroups(string name, int base_group_id)
+/* {{{ proto bool posix_initgroups(string name, int base_group_id)
Calculate the group access list for the user specified in name. */
PHP_FUNCTION(posix_initgroups)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.101 php-src/ext/tidy/tidy.c:1.102
--- php-src/ext/tidy/tidy.c:1.101 Fri Sep 15 14:59:04 2006
+++ php-src/ext/tidy/tidy.c Mon Oct 2 07:54:37 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.101 2006/09/15 14:59:04 nlopess Exp $ */
+/* $Id: tidy.c,v 1.102 2006/10/02 07:54:37 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1012,7 +1012,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Tidy support", "enabled");
php_info_print_table_row(2, "libTidy Release", (char
*)tidyReleaseDate());
- php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.101 2006/09/15 14:59:04 nlopess Exp
$)");
+ php_info_print_table_row(2, "Extension Version",
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.102 2006/10/02 07:54:37 bjori Exp
$)");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1387,7 +1387,7 @@
}
/* }}} */
-/* {{{ proto bool tidy_is_xhtml() U
+/* {{{ proto bool tidy_is_xml() U
Indicates if the document is a generic (non HTML/XHTML) XML document. */
static PHP_FUNCTION(tidy_is_xml)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.806&r2=1.807&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.806
php-src/ext/standard/basic_functions.c:1.807
--- php-src/ext/standard/basic_functions.c:1.806Sun Oct 1 21:00:00 2006
+++ php-src/ext/standard/basic_functions.c Mon Oct 2 07:54:37 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.806 2006/10/01 21:00:00 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.807 2006/10/02 07:54:37 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -6317,6 +6317,8 @@
/* }}} */
#ifdef HAVE_GETLOADAVG
+/* {{{ proto array sys_getloadavg()
+*/
PHP_FUNCTION(sys_getloadavg)
{
double load[3];
@@ -6330,6 +6332,7 @@
add_index_double(return_value, 2, load[2]);
}
}
+/* }}} */
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.115&r2=1.116&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.115 php-src/ext/standard/html.c:1.116
--- php-src/ext/standard/html.c:1.115 Tue Aug 15 15:09:21 2006
+++ php-src/ext/standard/html.c Mon Oct 2 07:54:37 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.115 2006/08/15 15:09:21 tony2001 Exp $ */
+/* $Id: html.c,v 1.116 2006/10/02 07:54:37 bjori Exp $ */
/*
* HTML entity resources:
@@ -1223,7 +1223,7 @@
}
/* }}} */
-/* {{{ proto string htmlspecialchars(string string [, int quote_style])
+/* {{{ proto string htmlspecialchars_decode(string string [, int quote_style])
Convert special HTML entities back to characters */
PHP_FUNCTION(htmlspecialchars_decode)
{
--
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/mysqli mysqli_api.c mysqli_nonapi.c
bjori Mon Oct 2 07:44:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c
Log:
Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.7&r2=1.118.2.22.2.8&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.7
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.8
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.7 Fri Sep 29 08:40:10 2006
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 2 07:44:34 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.7 2006/09/29 08:40:10 georg Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.8 2006/10/02 07:44:34 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1522,7 +1522,7 @@
}
/* }}} */
-/* {{{ proto bool mysqli_send_long_data(object stmt, int param_nr, string data)
+/* {{{ proto bool mysqli_stmt_send_long_data(object stmt, int param_nr, string
data)
*/
PHP_FUNCTION(mysqli_stmt_send_long_data)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7&r2=1.54.2.7.2.1&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.1
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7 Fri Mar 24 09:32:24 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 2 07:44:34 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7 2006/03/24 09:32:24 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.1 2006/10/02 07:44:34 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -289,7 +289,7 @@
}
/* }}} */
-/* {{{ proto object mysqli_get_warnings(object link) */
+/* {{{ proto object mysqli_stmt_get_warnings(object link) */
PHP_FUNCTION(mysqli_stmt_get_warnings)
{
MY_STMT *stmt;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_nonapi.c
bjori Mon Oct 2 07:42:49 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c
Log:
Fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.134&r2=1.135&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.134
php-src/ext/mysqli/mysqli_api.c:1.135
--- php-src/ext/mysqli/mysqli_api.c:1.134 Sun Oct 1 21:01:31 2006
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 2 07:42:49 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_api.c,v 1.134 2006/10/01 21:01:31 georg Exp $
+ $Id: mysqli_api.c,v 1.135 2006/10/02 07:42:49 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1539,7 +1539,7 @@
}
/* }}} */
-/* {{{ proto bool mysqli_send_long_data(object stmt, int param_nr, string
data) U
+/* {{{ proto bool mysqli_stmt_send_long_data(object stmt, int param_nr, string
data) U
*/
PHP_FUNCTION(mysqli_stmt_send_long_data)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.64&r2=1.65&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.64
php-src/ext/mysqli/mysqli_nonapi.c:1.65
--- php-src/ext/mysqli/mysqli_nonapi.c:1.64 Sun Oct 1 21:01:31 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 2 07:42:49 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_nonapi.c,v 1.64 2006/10/01 21:01:31 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.65 2006/10/02 07:42:49 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -289,7 +289,7 @@
}
/* }}} */
-/* {{{ proto object mysqli_get_warnings(object link) U */
+/* {{{ proto object mysqli_stmt_get_warnings(object link) U */
PHP_FUNCTION(mysqli_stmt_get_warnings)
{
MY_STMT *stmt;
--
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/mysqli mysqli_report.c
bjori Mon Oct 2 07:36:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli_report.c
Log:
Fix proto
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_report.c?r1=1.11.2.2&r2=1.11.2.2.2.1&diff_format=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.11.2.2
php-src/ext/mysqli/mysqli_report.c:1.11.2.2.2.1
--- php-src/ext/mysqli/mysqli_report.c:1.11.2.2 Sun Jan 1 12:50:09 2006
+++ php-src/ext/mysqli/mysqli_report.c Mon Oct 2 07:36:18 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_report.c,v 1.11.2.2 2006/01/01 12:50:09 sniper Exp $
+ $Id: mysqli_report.c,v 1.11.2.2.2.1 2006/10/02 07:36:18 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
#include "ext/standard/info.h"
#include "php_mysqli.h"
-/* {{{ bool mysqli_report(int flags)
+/* {{{ proto bool mysqli_report(int flags)
sets report level */
PHP_FUNCTION(mysqli_report)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_report.c
bjori Mon Oct 2 07:35:09 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli_report.c
Log:
Fix proto
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_report.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.14
php-src/ext/mysqli/mysqli_report.c:1.15
--- php-src/ext/mysqli/mysqli_report.c:1.14 Tue Sep 26 13:06:13 2006
+++ php-src/ext/mysqli/mysqli_report.c Mon Oct 2 07:35:09 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli_report.c,v 1.14 2006/09/26 13:06:13 georg Exp $
+ $Id: mysqli_report.c,v 1.15 2006/10/02 07:35:09 bjori Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
#include "ext/standard/info.h"
#include "php_mysqli.h"
-/* {{{ bool mysqli_report(int flags) U
+/* {{{ proto bool mysqli_report(int flags) U
sets report level */
PHP_FUNCTION(mysqli_report)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
bjori Mon Oct 2 07:32:16 2006 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
add proto
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.119&r2=1.120&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.119 php-src/ext/date/php_date.c:1.120
--- php-src/ext/date/php_date.c:1.119 Wed Sep 27 18:32:24 2006
+++ php-src/ext/date/php_date.c Mon Oct 2 07:32:16 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.119 2006/09/27 18:32:24 derick Exp $ */
+/* $Id: php_date.c,v 1.120 2006/10/02 07:32:16 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1932,7 +1932,10 @@
RETURN_STRINGL(str, length, 0);
}
}
+/* }}} */
+/* {{{ proto string date_format_locale(DateTime object, string format)
+*/
PHP_FUNCTION(date_format_locale)
{
zval *object;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/tests .cvsignore
bjori Mon Oct 2 07:26:51 2006 UTC Modified files: /php-src/ext/zip/tests .cvsignore Log: Add .cvsignore http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/.cvsignore?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/zip/tests/.cvsignore diff -u /dev/null php-src/ext/zip/tests/.cvsignore:1.7 --- /dev/null Mon Oct 2 07:26:51 2006 +++ php-src/ext/zip/tests/.cvsignoreMon Oct 2 07:26:51 2006 @@ -0,0 +1,8 @@ +phpt.* +*.diff +*.log +*.exp +*.out +*.php +*.gcda +*.gcno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
