[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jan 11 01:30:59 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2568r2=1.2569diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2568 php-src/ChangeLog:1.2569 --- php-src/ChangeLog:1.2568Wed Jan 10 01:31:03 2007 +++ php-src/ChangeLog Thu Jan 11 01:30:59 2007 @@ -1,3 +1,174 @@ +2007-01-10 Andrei Zmievski [EMAIL PROTECTED] + +* INSTALL + Makefile.global + acinclude.m4 + configure.in + makerpm + sapi/apache/.cvsignore + sapi/apache/apMakefile.tmpl + sapi/apache/config.m4 + sapi/apache/libphp5.module.in + sapi/apache/libphp6.module.in + sapi/apache/mod_php.c + sapi/apache/mod_php.exp + sapi/apache/mod_php.h + sapi/apache/mod_php5.c + sapi/apache/mod_php5.exp + sapi/apache/mod_php5.h + sapi/apache/php.sym + sapi/apache/php_apache_http.h + sapi/cli/config.m4: + Rename php5 module to php6. Remove version number from + sapi/apache/mod_php.* filenames (for future's sake). No other SAPI + moduels modified (up to invididual maintainers). + +* README.UNICODE: + Update with rewrites by me and Evan G. + +* README.UNICODE-UPGRADES: + Update with info from README.UNICODE. + +2007-01-10 Sara Golemon [EMAIL PROTECTED] + +* main/php_streams.h + main/streams/streams.c: + Add convenience function for openeing files with unicode names + +2007-01-10 Johannes Schlüter [EMAIL PROTECTED] + +* sapi/cli/php.1.in: + - Bump year + +2007-01-10 Hannes Magnusson [EMAIL PROTECTED] + +* ext/sockets/php_sockets.h + ext/sockets/sockets.c: + MFB: Add missing ifdefs + +2007-01-10 Marcus Boerger [EMAIL PROTECTED] + +* ext/standard/file.c: + - Fix mem access + +2007-01-10 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/spl/php_spl.c + ext/spl/tests/bug40091.phpt + ext/spl/tests/bug40091.phpt: + + Fixed bug #40091 (spl_autoload_register with 2 instances of the same + class). + +2007-01-10 Andrei Zmievski [EMAIL PROTECTED] + +* ZendEngine2/zend_API.h: + Remove const warnings. (Andrey) + +2007-01-10 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + + Another bug fixed by Dmitry + +2007-01-10 Dmitry Stogov [EMAIL PROTECTED] + +* ext/simplexml/tests/bug38347.phpt + ext/simplexml/tests/bug38347.phpt + ext/spl/tests/iterator_035.phpt + ext/spl/tests/iterator_035.phpt + tests/classes/bug27468.phpt + tests/classes/bug27468.phpt + tests/lang/bug27439.phpt + tests/lang/bug27439.phpt: + Fixed tests + +* ZendEngine2/tests/bug35106.phpt + ZendEngine2/tests/bug35106.phpt + ZendEngine2/tests/bug36214.phpt + ZendEngine2/tests/bug36214.phpt + ZendEngine2/tests/bug38146.phpt + ZendEngine2/tests/bug39449.phpt + ZendEngine2/tests/bug39449.phpt + ZendEngine2/tests/bug39990.phpt + ZendEngine2/tests/bug39990.phpt: + + file bug35106.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_compile.h + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.h + ZendEngine2/zend_execute.h + ZendEngine2/zend_hash.c + ZendEngine2/zend_hash.c + ZendEngine2/zend_hash.h + ZendEngine2/zend_hash.h + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug35106.phpt + ZendEngine2/tests/bug36214.phpt + ZendEngine2/tests/bug38146.phpt + ZendEngine2/tests/bug39449.phpt + ZendEngine2/tests/bug39990.phpt: + - Fixed bug #35106 (nested foreach fails when array variable has a + reference). + - Fixed bug #36214 (__get method works properly only when conditional + operator is used). + - Fixed bug #39449 (Overloaded array properties do not work correctly). + - Fixed bug #39990 (Cannot foreach over overloaded properties). + +2007-01-10 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + ext/sockets/php_sockets.h + ext/sockets/sockets.c: + Add missing ifdefs for shutdown() + +* ext/standard/file.h: + MFB: fix ifdefs + +* (PHP_5_2) + ext/standard/file.h: + Fix ifdefs + +* (PHP_5_2) + ext/pcre/php_pcre.c: + Fix build on system where HAVE_SETLOCALE is not defined + +2007-01-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +*
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jan 11 01:31:01 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1054r2=1.1055diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1054 ZendEngine2/ChangeLog:1.1055 --- ZendEngine2/ChangeLog:1.1054Wed Jan 10 01:31:05 2007 +++ ZendEngine2/ChangeLog Thu Jan 11 01:31:01 2007 @@ -1,3 +1,54 @@ +2007-01-10 Andrei Zmievski [EMAIL PROTECTED] + +* zend_API.h: + Remove const warnings. (Andrey) + +2007-01-10 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + zend_compile.h + zend_compile.h + zend_execute.c + zend_execute.c + zend_execute.h + zend_execute.h + zend_hash.c + zend_hash.c + zend_hash.h + zend_hash.h + zend_language_parser.y + zend_language_parser.y + zend_object_handlers.c + zend_object_handlers.c + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + tests/bug35106.phpt + tests/bug36214.phpt + tests/bug38146.phpt + tests/bug39449.phpt + tests/bug39990.phpt: + - Fixed bug #35106 (nested foreach fails when array variable has a + reference). + - Fixed bug #36214 (__get method works properly only when conditional + operator is used). + - Fixed bug #39449 (Overloaded array properties do not work correctly). + - Fixed bug #39990 (Cannot foreach over overloaded properties). + +* tests/bug35106.phpt + tests/bug35106.phpt + tests/bug36214.phpt + tests/bug36214.phpt + tests/bug38146.phpt + tests/bug39449.phpt + tests/bug39449.phpt + tests/bug39990.phpt + tests/bug39990.phpt: + + file bug35106.phpt was initially added on branch PHP_5_2. + 2007-01-09 Andrei Zmievski [EMAIL PROTECTED] * zend_language_scanner.l @@ -16557,7 +16608,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1054 2007/01/10 01:31:05 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1055 2007/01/11 01:31:01 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -18281,7 +18332,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1054 2007/01/10 01:31:05 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1055 2007/01/11 01:31:01 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/milter php_milter.c
tony2001Wed Jan 10 12:03:11 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/milterphp_milter.c
Log:
use RETURN_* instead of RETVAL_* and fix #40083
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.1r2=1.14.2.2.2.2diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.1
php-src/sapi/milter/php_milter.c:1.14.2.2.2.2
--- php-src/sapi/milter/php_milter.c:1.14.2.2.2.1 Mon Jan 1 09:36:13 2007
+++ php-src/sapi/milter/php_milter.cWed Jan 10 12:03:11 2007
@@ -581,11 +581,11 @@
php_error(E_WARNING, IS_NONE,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, symname, len) ==
SUCCESS) {
if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
- RETVAL_STRING(ret, 1);
+ RETURN_STRING(ret, 1);
}
}
- RETVAL_NULL();
+ RETURN_NULL();
}
/* }}} */
@@ -602,11 +602,11 @@
php_error(E_WARNING, IS_NONE,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(3 TSRMLS_CC, sss, rcode, len,
xcode, len, message, len) == SUCCESS) {
if (smfi_setreply(MG(ctx), rcode, xcode, message) ==
MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -622,11 +622,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(2 TSRMLS_CC, ss, f, len, v, len)
== SUCCESS) {
if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -643,11 +643,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(3 TSRMLS_CC, sls, f, len, idx,
v, len) == SUCCESS) {
if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -663,11 +663,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, rcpt, len) ==
SUCCESS) {
if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -683,11 +683,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, rcpt, len) ==
SUCCESS) {
if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -704,11 +704,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, body, len) ==
SUCCESS) {
if (smfi_replacebody(MG(ctx), body, len) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/milter php_milter.c
tony2001Wed Jan 10 14:10:28 2007 UTC
Modified files:
/php-src/sapi/milterphp_milter.c
Log:
fix #40083
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.18r2=1.19diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.18
php-src/sapi/milter/php_milter.c:1.19
--- php-src/sapi/milter/php_milter.c:1.18 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/milter/php_milter.cWed Jan 10 14:10:28 2007
@@ -581,11 +581,11 @@
php_error(E_WARNING, IS_NONE,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, symname, len) ==
SUCCESS) {
if ((ret = smfi_getsymval(MG(ctx), symname)) != NULL) {
- RETVAL_STRING(ret, 1);
+ RETURN_STRING(ret, 1);
}
}
- RETVAL_NULL();
+ RETURN_NULL();
}
/* }}} */
@@ -602,11 +602,11 @@
php_error(E_WARNING, IS_NONE,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(3 TSRMLS_CC, sss, rcode, len,
xcode, len, message, len) == SUCCESS) {
if (smfi_setreply(MG(ctx), rcode, xcode, message) ==
MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -622,11 +622,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(2 TSRMLS_CC, ss, f, len, v, len)
== SUCCESS) {
if (smfi_addheader(MG(ctx), f, v) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -643,11 +643,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(3 TSRMLS_CC, sls, f, len, idx,
v, len) == SUCCESS) {
if (smfi_chgheader(MG(ctx), f, idx, v) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -663,11 +663,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, rcpt, len) ==
SUCCESS) {
if (smfi_addrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -683,11 +683,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, rcpt, len) ==
SUCCESS) {
if (smfi_delrcpt(MG(ctx), rcpt) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
@@ -704,11 +704,11 @@
php_error(E_WARNING, NOT_EOM,
get_active_function_name(TSRMLS_C));
} else if (zend_parse_parameters(1 TSRMLS_CC, s, body, len) ==
SUCCESS) {
if (smfi_replacebody(MG(ctx), body, len) == MI_SUCCESS) {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
}
- RETVAL_FALSE;
+ RETURN_FALSE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Wed Jan 10 14:11:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.485r2=1.2027.2.547.2.486diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.485 php-src/NEWS:1.2027.2.547.2.486 --- php-src/NEWS:1.2027.2.547.2.485 Tue Jan 9 23:27:22 2007 +++ php-src/NEWSWed Jan 10 14:11:44 2007 @@ -4,6 +4,7 @@ - Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara) - Improved proc_open(). Now on Windows it can run external commands not through CMD.EXE. (Dmitry) +- Fixed bug #40083 (milter SAPI functions always return false/null). (Tony) - Fixed bug #40079 (php_get_current_user() not thread safe). (Ilia, wharmby at uk dot ibm dot com) - Fixed bug #40076 (zend_alloc.c: Value of enumeration constant must be in -- 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/pcre php_pcre.c
bjori Wed Jan 10 14:37:31 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pcre php_pcre.c Log: Fix build on system where HAVE_SETLOCALE is not defined http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.14r2=1.168.2.9.2.15diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.14 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.15 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.14 Mon Jan 1 09:36:04 2007 +++ php-src/ext/pcre/php_pcre.c Wed Jan 10 14:37:31 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.14 2007/01/01 09:36:04 sebastian Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.15 2007/01/10 14:37:31 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -214,8 +214,8 @@ return pce; #if HAVE_SETLOCALE } - } #endif + } } p = regex; -- 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 file.h
bjori Wed Jan 10 14:40:06 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard file.h Log: Fix ifdefs http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.h?r1=1.94.2.2.2.4r2=1.94.2.2.2.5diff_format=u Index: php-src/ext/standard/file.h diff -u php-src/ext/standard/file.h:1.94.2.2.2.4 php-src/ext/standard/file.h:1.94.2.2.2.5 --- php-src/ext/standard/file.h:1.94.2.2.2.4Mon Jan 1 09:36:08 2007 +++ php-src/ext/standard/file.h Wed Jan 10 14:40:06 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: file.h,v 1.94.2.2.2.4 2007/01/01 09:36:08 sebastian Exp $ */ +/* $Id: file.h,v 1.94.2.2.2.5 2007/01/10 14:40:06 bjori Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -60,8 +60,10 @@ PHP_FUNCTION(flock); PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); -#if (!defined(__BEOS__) HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) !defined(NETWARE) HAVE_REALPATH) || defined(ZTS) PHP_FUNCTION(realpath); +#endif +#ifdef HAVE_FNMATCH PHP_FUNCTION(fnmatch); #endif PHP_NAMED_FUNCTION(php_if_ftruncate); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.h
bjori Wed Jan 10 15:06:59 2007 UTC Modified files: /php-src/ext/standard file.h Log: MFB: fix ifdefs http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.h?r1=1.103r2=1.104diff_format=u Index: php-src/ext/standard/file.h diff -u php-src/ext/standard/file.h:1.103 php-src/ext/standard/file.h:1.104 --- php-src/ext/standard/file.h:1.103 Mon Jan 1 09:29:31 2007 +++ php-src/ext/standard/file.h Wed Jan 10 15:06:58 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: file.h,v 1.103 2007/01/01 09:29:31 sebastian Exp $ */ +/* $Id: file.h,v 1.104 2007/01/10 15:06:58 bjori Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -60,8 +60,10 @@ PHP_FUNCTION(flock); PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); -#if (!defined(__BEOS__) HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) !defined(NETWARE) HAVE_REALPATH) || defined(ZTS) PHP_FUNCTION(realpath); +#endif +#ifdef HAVE_FNMATCH PHP_FUNCTION(fnmatch); #endif PHP_NAMED_FUNCTION(php_if_ftruncate); -- 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/sockets php_sockets.h sockets.c
bjori Wed Jan 10 15:25:07 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/socketssockets.c php_sockets.h
Log:
Add missing ifdefs for shutdown()
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.6r2=1.171.2.9.2.7diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.6
php-src/ext/sockets/sockets.c:1.171.2.9.2.7
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.6 Mon Jan 1 09:36:07 2007
+++ php-src/ext/sockets/sockets.c Wed Jan 10 15:25:07 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.6 2007/01/01 09:36:07 sebastian Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.7 2007/01/10 15:25:07 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -138,7 +138,9 @@
PHP_FE(socket_sendto, NULL)
PHP_FE(socket_get_option, NULL)
PHP_FE(socket_set_option, NULL)
+#ifdef HAVE_SHUTDOWN
PHP_FE(socket_shutdown, NULL)
+#endif
PHP_FE(socket_last_error, NULL)
PHP_FE(socket_clear_error, NULL)
@@ -1759,6 +1761,7 @@
/* }}} */
#endif
+#ifdef HAVE_SHUTDOWN
/* {{{ proto bool socket_shutdown(resource socket[, int how])
Shuts down a socket for receiving, sending, or both. */
PHP_FUNCTION(socket_shutdown)
@@ -1780,6 +1783,7 @@
RETURN_TRUE;
}
/* }}} */
+#endif
/* {{{ proto int socket_last_error([resource socket])
Returns the last socket error (either the last used or the provided socket
resource) */
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/php_sockets.h?r1=1.36.2.1.2.1r2=1.36.2.1.2.2diff_format=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.36.2.1.2.1
php-src/ext/sockets/php_sockets.h:1.36.2.1.2.2
--- php-src/ext/sockets/php_sockets.h:1.36.2.1.2.1 Mon Jan 1 09:36:07 2007
+++ php-src/ext/sockets/php_sockets.h Wed Jan 10 15:25:07 2007
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.36.2.1.2.1 2007/01/01 09:36:07 sebastian Exp $ */
+/* $Id: php_sockets.h,v 1.36.2.1.2.2 2007/01/10 15:25:07 bjori Exp $ */
#if HAVE_SOCKETS
@@ -66,7 +66,9 @@
PHP_FUNCTION(socket_sendto);
PHP_FUNCTION(socket_get_option);
PHP_FUNCTION(socket_set_option);
+#ifdef HAVE_SHUTDOWN
PHP_FUNCTION(socket_shutdown);
+#endif
PHP_FUNCTION(socket_last_error);
PHP_FUNCTION(socket_clear_error);
--
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/simplexml/tests bug38347.phpt /ext/spl/tests iterator_035.phpt /tests/classes bug27468.phpt /tests/lang bug27439.phpt
dmitry Wed Jan 10 16:00:31 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/classes bug27468.phpt /php-src/tests/lang bug27439.phpt /php-src/ext/simplexml/testsbug38347.phpt /php-src/ext/spl/tests iterator_035.phpt Log: Fixed tests http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug27468.phpt?r1=1.3r2=1.3.6.1diff_format=u Index: php-src/tests/classes/bug27468.phpt diff -u php-src/tests/classes/bug27468.phpt:1.3 php-src/tests/classes/bug27468.phpt:1.3.6.1 --- php-src/tests/classes/bug27468.phpt:1.3 Fri Mar 5 12:16:28 2004 +++ php-src/tests/classes/bug27468.phpt Wed Jan 10 16:00:31 2007 @@ -11,5 +11,7 @@ echo 'OK'; ? --EXPECTF-- +Notice: Undefined property: foo::$x in %sbug27468.php on line 4 + Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4 OK http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug27439.phpt?r1=1.2r2=1.2.6.1diff_format=u Index: php-src/tests/lang/bug27439.phpt diff -u php-src/tests/lang/bug27439.phpt:1.2 php-src/tests/lang/bug27439.phpt:1.2.6.1 --- php-src/tests/lang/bug27439.phpt:1.2Tue Mar 2 16:12:25 2004 +++ php-src/tests/lang/bug27439.phptWed Jan 10 16:00:31 2007 @@ -65,6 +65,8 @@ ? --EXPECTF-- 123 +Notice: Undefined property: test::$foobar in %s on line %d + Warning: Invalid argument supplied for foreach() in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38347.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/simplexml/tests/bug38347.phpt diff -u php-src/ext/simplexml/tests/bug38347.phpt:1.1.2.2 php-src/ext/simplexml/tests/bug38347.phpt:1.1.2.3 --- php-src/ext/simplexml/tests/bug38347.phpt:1.1.2.2 Sun Aug 6 17:41:51 2006 +++ php-src/ext/simplexml/tests/bug38347.phpt Wed Jan 10 16:00:31 2007 @@ -24,5 +24,5 @@ ( ) -Warning: iterate(): Node no longer exists in %s on line %d +Warning: Invalid argument supplied for foreach() in %sbug38347.php on line 6 Done http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_035.phpt?r1=1.1.2.1.2.2r2=1.1.2.1.2.3diff_format=u Index: php-src/ext/spl/tests/iterator_035.phpt diff -u php-src/ext/spl/tests/iterator_035.phpt:1.1.2.1.2.2 php-src/ext/spl/tests/iterator_035.phpt:1.1.2.1.2.3 --- php-src/ext/spl/tests/iterator_035.phpt:1.1.2.1.2.2 Fri Dec 8 15:55:31 2006 +++ php-src/ext/spl/tests/iterator_035.phpt Wed Jan 10 16:00:31 2007 @@ -14,6 +14,4 @@ echo Done\n; ? --EXPECTF-- -Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %siterator_035.php on line 7 - Fatal error: Cannot assign by reference to overloaded object in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml/tests bug38347.phpt /ext/spl/tests iterator_035.phpt /tests/classes bug27468.phpt /tests/lang bug27439.phpt
dmitry Wed Jan 10 16:00:57 2007 UTC Modified files: /php-src/tests/classes bug27468.phpt /php-src/tests/lang bug27439.phpt /php-src/ext/simplexml/testsbug38347.phpt /php-src/ext/spl/tests iterator_035.phpt Log: Fixed tests http://cvs.php.net/viewvc.cgi/php-src/tests/classes/bug27468.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/tests/classes/bug27468.phpt diff -u php-src/tests/classes/bug27468.phpt:1.3 php-src/tests/classes/bug27468.phpt:1.4 --- php-src/tests/classes/bug27468.phpt:1.3 Fri Mar 5 12:16:28 2004 +++ php-src/tests/classes/bug27468.phpt Wed Jan 10 16:00:57 2007 @@ -11,5 +11,7 @@ echo 'OK'; ? --EXPECTF-- +Notice: Undefined property: foo::$x in %sbug27468.php on line 4 + Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4 OK http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug27439.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/tests/lang/bug27439.phpt diff -u php-src/tests/lang/bug27439.phpt:1.2 php-src/tests/lang/bug27439.phpt:1.3 --- php-src/tests/lang/bug27439.phpt:1.2Tue Mar 2 16:12:25 2004 +++ php-src/tests/lang/bug27439.phptWed Jan 10 16:00:57 2007 @@ -65,6 +65,8 @@ ? --EXPECTF-- 123 +Notice: Undefined property: test::$foobar in %s on line %d + Warning: Invalid argument supplied for foreach() in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug38347.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/simplexml/tests/bug38347.phpt diff -u php-src/ext/simplexml/tests/bug38347.phpt:1.2 php-src/ext/simplexml/tests/bug38347.phpt:1.3 --- php-src/ext/simplexml/tests/bug38347.phpt:1.2 Tue Aug 8 20:52:45 2006 +++ php-src/ext/simplexml/tests/bug38347.phpt Wed Jan 10 16:00:57 2007 @@ -24,12 +24,5 @@ ( ) -Warning: iterate(): Node no longer exists in %s on line %d -Done ---UEXPECTF-- -SimpleXMLElement Object -( -) - -Warning: iterate(): Node no longer exists in %s on line %d +Warning: Invalid argument supplied for foreach() in %sbug38347.php on line 6 Done http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/iterator_035.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/spl/tests/iterator_035.phpt diff -u php-src/ext/spl/tests/iterator_035.phpt:1.4 php-src/ext/spl/tests/iterator_035.phpt:1.5 --- php-src/ext/spl/tests/iterator_035.phpt:1.4 Fri Dec 8 16:23:04 2006 +++ php-src/ext/spl/tests/iterator_035.phpt Wed Jan 10 16:00:57 2007 @@ -14,6 +14,4 @@ echo Done\n; ? --EXPECTF-- -Notice: Indirect modification of overloaded element of ArrayIterator has no effect in %siterator_035.php on line 7 - Fatal error: Cannot assign by reference to overloaded object in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Wed Jan 10 16:14:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Another bug fixed by Dmitry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.487r2=1.2027.2.547.2.488diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.487 php-src/NEWS:1.2027.2.547.2.488 --- php-src/NEWS:1.2027.2.547.2.487 Wed Jan 10 15:58:07 2007 +++ php-src/NEWSWed Jan 10 16:14:34 2007 @@ -21,6 +21,8 @@ - Fixed bug #39449 (Overloaded array properties do not work correctly). (Dmitry) - Fixed bug #39394 (Missing check for older variants of openssl). (Ilia) +- Fixed bug #38604 (Fixed request time leak inside foreach() when itterating + through virtual properties). (Dmitry) - Fixed bug #38325 (spl_autoload_register() gaves wrong line for class not found). (Ilia) - Fixed bug #36214 (__get method works properly only when conditional operator -- 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/spl php_spl.c /ext/spl/tests bug40091.phpt
iliaa Wed Jan 10 18:14:38 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/spl/tests bug40091.phpt
Modified files:
/php-srcNEWS
/php-src/ext/splphp_spl.c
Log:
Fixed bug #40091 (spl_autoload_register with 2 instances of the same class).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.488r2=1.2027.2.547.2.489diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.488 php-src/NEWS:1.2027.2.547.2.489
--- php-src/NEWS:1.2027.2.547.2.488 Wed Jan 10 16:14:34 2007
+++ php-src/NEWSWed Jan 10 18:14:37 2007
@@ -4,6 +4,8 @@
- Added CURLOPT_TCP_NODELAY constant to Curl extension. (Sara)
- Improved proc_open(). Now on Windows it can run external commands not through
CMD.EXE. (Dmitry)
+- Fixed bug #40091 (spl_autoload_register with 2 instances of the same
+ class). (Ilia)
- Fixed bug #40083 (milter SAPI functions always return false/null). (Tony)
- Fixed bug #40079 (php_get_current_user() not thread safe). (Ilia, wharmby
at uk dot ibm dot com)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.13r2=1.52.2.28.2.14diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.13
php-src/ext/spl/php_spl.c:1.52.2.28.2.14
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.13Mon Jan 8 04:27:29 2007
+++ php-src/ext/spl/php_spl.c Wed Jan 10 18:14:37 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.13 2007/01/08 04:27:29 iliaa Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.14 2007/01/10 18:14:37 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -444,10 +444,19 @@
}
}
- lc_name = do_alloca(func_name_len + 1);
+ lc_name = safe_emalloc(func_name_len, 1, sizeof(long) + 1);
zend_str_tolower_copy(lc_name, func_name, func_name_len);
efree(func_name);
+
+ if (SPL_G(autoload_functions)
zend_hash_exists(SPL_G(autoload_functions), (char*)lc_name, func_name_len+1)) {
+ goto skip;
+ }
+
if (obj_ptr !(alfi.func_ptr-common.fn_flags
ZEND_ACC_STATIC)) {
+ /* add object id to the hash to ensure uniqueness, for
more reference look at bug #40091 */
+ memcpy(lc_name + func_name_len, obj_ptr, sizeof(long));
+ func_name_len += sizeof(long);
+ lc_name[func_name_len] = '\0';
alfi.obj = *obj_ptr;
alfi.obj-refcount++;
} else {
@@ -471,8 +480,8 @@
}
zend_hash_add(SPL_G(autoload_functions), lc_name,
func_name_len+1, alfi.func_ptr, sizeof(autoload_func_info), NULL);
-
- free_alloca(lc_name);
+skip:
+ efree(lc_name);
}
if (SPL_G(autoload_functions)) {
@@ -492,12 +501,13 @@
zval *zcallable;
int success = FAILURE;
zend_function *spl_func_ptr;
+ zval **obj_ptr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, z, zcallable)
== FAILURE) {
return;
}
- if (!zend_is_callable_ex(zcallable, IS_CALLABLE_CHECK_SYNTAX_ONLY,
func_name, func_name_len, NULL, NULL, NULL TSRMLS_CC)) {
+ if (!zend_is_callable_ex(zcallable, IS_CALLABLE_CHECK_SYNTAX_ONLY,
func_name, func_name_len, NULL, NULL, obj_ptr TSRMLS_CC)) {
if (func_name) {
efree(func_name);
}
@@ -517,6 +527,13 @@
} else {
/* remove specific */
success = zend_hash_del(SPL_G(autoload_functions),
func_name, func_name_len+1);
+ if (success != SUCCESS obj_ptr) {
+ func_name = erealloc(func_name, func_name_len +
1 + sizeof(long));
+ memcpy(func_name + func_name_len, obj_ptr,
sizeof(long));
+ func_name_len += sizeof(long);
+ func_name[func_name_len] = '\0';
+ success =
zend_hash_del(SPL_G(autoload_functions), func_name, func_name_len+1);
+ }
}
} else if (func_name_len == sizeof(spl_autoload)-1
!strcmp(func_name, spl_autoload)) {
/* register single spl_autoload() */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug40091.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug40091.phpt
+++ php-src/ext/spl/tests/bug40091.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c
helly Wed Jan 10 20:12:14 2007 UTC
Modified files:
/php-src/ext/standard file.c
Log:
- Fix mem access
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.482r2=1.483diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.482 php-src/ext/standard/file.c:1.483
--- php-src/ext/standard/file.c:1.482 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/file.c Wed Jan 10 20:12:14 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.482 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: file.c,v 1.483 2007/01/10 20:12:14 helly Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2425,6 +2425,7 @@
state = PHP_FGETCSV_READY;
field_start = field_end = NULL;
p += delimiter_len;
+ if (p = e) break;
goto ready_state;
}
@@ -2446,6 +2447,7 @@
state = PHP_FGETCSV_READY;
field_start = field_end = NULL;
p += delimiter_len;
+ if (p = e) break;
goto ready_state;
}
@@ -2546,6 +2548,7 @@
memmove(p, p + enclosure_len,
(e - p) - enclosure_len);
e -= enclosure_len;
p += enclosure_len;
+ if (p = e) break;
goto with_enc;
} else {
/* Genuine end enclosure,
switch state */
@@ -2561,6 +2564,7 @@
p += escape_len + 1;
/* Reprocess for ending enclosures */
+ if (p = e) break;
goto with_enc;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets php_sockets.h sockets.c
bjori Wed Jan 10 21:26:09 2007 UTC
Modified files:
/php-src/ext/socketsphp_sockets.h sockets.c
Log:
MFB: Add missing ifdefs
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/php_sockets.h?r1=1.38r2=1.39diff_format=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.38
php-src/ext/sockets/php_sockets.h:1.39
--- php-src/ext/sockets/php_sockets.h:1.38 Mon Jan 1 09:29:29 2007
+++ php-src/ext/sockets/php_sockets.h Wed Jan 10 21:26:09 2007
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.38 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: php_sockets.h,v 1.39 2007/01/10 21:26:09 bjori Exp $ */
#if HAVE_SOCKETS
@@ -66,7 +66,9 @@
PHP_FUNCTION(socket_sendto);
PHP_FUNCTION(socket_get_option);
PHP_FUNCTION(socket_set_option);
+#ifdef HAVE_SHUTDOWN
PHP_FUNCTION(socket_shutdown);
+#endif
PHP_FUNCTION(socket_last_error);
PHP_FUNCTION(socket_clear_error);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.187r2=1.188diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.187 php-src/ext/sockets/sockets.c:1.188
--- php-src/ext/sockets/sockets.c:1.187 Mon Jan 1 09:29:29 2007
+++ php-src/ext/sockets/sockets.c Wed Jan 10 21:26:09 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.187 2007/01/01 09:29:29 sebastian Exp $ */
+/* $Id: sockets.c,v 1.188 2007/01/10 21:26:09 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -136,7 +136,9 @@
PHP_FE(socket_sendto, NULL)
PHP_FE(socket_get_option, NULL)
PHP_FE(socket_set_option, NULL)
+#ifdef HAVE_SHUTDOWN
PHP_FE(socket_shutdown, NULL)
+#endif
PHP_FE(socket_last_error, NULL)
PHP_FE(socket_clear_error, NULL)
@@ -1786,6 +1788,7 @@
}
/* }}} */
+#ifdef HAVE_SHUTDOWN
/* {{{ proto bool socket_shutdown(resource socket[, int how]) U
Shuts down a socket for receiving, sending, or both. */
PHP_FUNCTION(socket_shutdown)
@@ -1808,6 +1811,7 @@
RETURN_TRUE;
}
/* }}} */
+#endif
/* {{{ proto int socket_last_error([resource socket]) U
Returns the last socket error (either the last used or the provided socket
resource) */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php.1.in
johannesWed Jan 10 22:17:09 2007 UTC Modified files: /php-src/sapi/cli php.1.in Log: - Bump year http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.15r2=1.16diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.15 php-src/sapi/cli/php.1.in:1.16 --- php-src/sapi/cli/php.1.in:1.15 Sun Apr 23 19:57:40 2006 +++ php-src/sapi/cli/php.1.in Wed Jan 10 22:17:09 2007 @@ -1,4 +1,4 @@ -.TH PHP 1 2006 The PHP Group Scripting Language +.TH PHP 1 2007 The PHP Group Scripting Language .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' @@ -390,7 +390,7 @@ .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @[EMAIL PROTECTED] .SH COPYRIGHT -Copyright \(co 1997\-2006 The PHP Group +Copyright \(co 1997\-2007 The PHP Group .LP This source file is subject to version 3.01 of the PHP license, that is bundled with this package in the file LICENSE, and is -- 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) /sapi/cli php.1.in
johannesWed Jan 10 22:17:27 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cli php.1.in Log: - MFH: Bump year http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.12.2.3r2=1.12.2.3.2.1diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.12.2.3 php-src/sapi/cli/php.1.in:1.12.2.3.2.1 --- php-src/sapi/cli/php.1.in:1.12.2.3 Sun Apr 23 19:56:53 2006 +++ php-src/sapi/cli/php.1.in Wed Jan 10 22:17:27 2007 @@ -1,4 +1,4 @@ -.TH PHP 1 2006 The PHP Group Scripting Language +.TH PHP 1 2007 The PHP Group Scripting Language .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' @@ -390,7 +390,7 @@ .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @[EMAIL PROTECTED] .SH COPYRIGHT -Copyright \(co 1997\-2006 The PHP Group +Copyright \(co 1997\-2007 The PHP Group .LP This source file is subject to version 3.01 of the PHP license, that is bundled with this package in the file LICENSE, and is -- 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) /sapi/cli php.1.in
johannesWed Jan 10 22:17:41 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/cli php.1.in Log: - MFH: Bump year http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.1.2.4.2.2r2=1.1.2.4.2.3diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.1.2.4.2.2 php-src/sapi/cli/php.1.in:1.1.2.4.2.3 --- php-src/sapi/cli/php.1.in:1.1.2.4.2.2 Wed Jul 26 16:25:58 2006 +++ php-src/sapi/cli/php.1.in Wed Jan 10 22:17:41 2007 @@ -1,4 +1,4 @@ -.TH PHP 1 2006 The PHP Group Scripting Language +.TH PHP 1 2007 The PHP Group Scripting Language .SH NAME .TP 15 php - PHP Command Line Interface 'CLI' @@ -185,7 +185,7 @@ .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @[EMAIL PROTECTED] .SH COPYRIGHT -Copyright \(co 1997\-2006 The PHP Group +Copyright \(co 1997\-2007 The PHP Group .LP This source file is subject to version 3.01 of the PHP license, that is bundled with this package in the file LICENSE, and is -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_streams.h /main/streams streams.c
pollita Wed Jan 10 22:43:17 2007 UTC
Modified files:
/php-src/main php_streams.h
/php-src/main/streams streams.c
Log:
Add convenience function for openeing files with unicode names
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.120r2=1.121diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.120 php-src/main/php_streams.h:1.121
--- php-src/main/php_streams.h:1.120Mon Jan 1 09:29:35 2007
+++ php-src/main/php_streams.h Wed Jan 10 22:43:17 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.120 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php_streams.h,v 1.121 2007/01/10 22:43:17 pollita Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -618,12 +618,18 @@
PHPAPI int php_unregister_url_stream_wrapper_volatile(char *protocol
TSRMLS_DC);
PHPAPI void php_stream_fix_encoding(php_stream *stream, const char *mode,
php_stream_context *context TSRMLS_DC);
PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int
options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
+PHPAPI php_stream *_php_stream_u_open_wrapper(zend_uchar type, zstr path, int
path_len, char *mode, int options, zstr *opened_path, int *opened_path_len,
php_stream_context *context STREAMS_DC TSRMLS_DC);
PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path,
char **path_for_open, int options TSRMLS_DC);
PHPAPI void *php_stream_locate_eol(php_stream *stream, zstr zbuf, int buf_len
TSRMLS_DC);
#define php_stream_open_wrapper(path, mode, options, opened)
_php_stream_open_wrapper_ex((path), (mode), (options), (opened), NULL
STREAMS_CC TSRMLS_CC)
#define php_stream_open_wrapper_ex(path, mode, options, opened, context)
_php_stream_open_wrapper_ex((path), (mode), (options), (opened), (context)
STREAMS_CC TSRMLS_CC)
+#define php_stream_u_open_wrapper(type, path, path_len, mode, options, opened,
context)\
+ _php_stream_u_open_wrapper((type), (path), (path_len), (mode),
(options), (opened), NULL, (context) STREAMS_CC TSRMLS_CC)
+#define php_stream_u_open_wrapper_ex(type, path, path_len, mode, options,
opened, opened_len, context) \
+ _php_stream_u_open_wrapper((type), (path), (path_len), (mode),
(options), (opened), (opened_len), (context) STREAMS_CC TSRMLS_CC)
+
#define php_stream_get_from_zval(stream, zstream, mode, options, opened,
context) \
if (Z_TYPE_PP((zstream)) == IS_RESOURCE) { \
php_stream_from_zval((stream), (zstream)); \
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.142r2=1.143diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.142
php-src/main/streams/streams.c:1.143
--- php-src/main/streams/streams.c:1.142Mon Jan 1 09:29:35 2007
+++ php-src/main/streams/streams.c Wed Jan 10 22:43:17 2007
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.142 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: streams.c,v 1.143 2007/01/10 22:43:17 pollita Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2434,6 +2434,61 @@
}
/* }}} */
+/* {{{ _php_stream_u_open_wrapper */
+PHPAPI php_stream *_php_stream_u_open_wrapper(zend_uchar type, zstr path, int
path_len,
+ char *mode, int options, zstr *opened_path, int
*opened_path_len,
+ php_stream_context *context STREAMS_DC TSRMLS_DC)
+{
+ php_stream *stream;
+ char *filename = NULL;
+ int filename_len;
+
+ if (opened_path) {
+ opened_path-v = NULL;
+ }
+ if (opened_path_len) {
+ *opened_path_len = 0;
+ }
+
+ if (type == IS_STRING) {
+ stream = php_stream_open_wrapper_ex(path.s, mode, options,
(char**)opened_path, context);
+
+ if (opened_path_len opened_path opened_path-s) {
+ *opened_path_len = strlen(opened_path-s);
+ }
+
+ return stream;
+ }
+
+ /* type == IS_UNICODE */
+ if (FAILURE == php_stream_path_encode(NULL, filename, filename_len,
path.u, path_len, options, context)) {
+ return NULL;
+ }
+
+ stream = php_stream_open_wrapper_ex(filename, mode, options,
(char**)opened_path, context);
+ efree(filename);
+
+ if (opened_path opened_path-s) {
+ UChar *upath;
+ int upath_len;
+
+ if (SUCCESS == php_stream_path_decode(NULL, upath, upath_len,
opened_path-s, strlen(opened_path-s), options, context)) {
+ efree(opened_path-s);
+ opened_path-u = upath;
+ if (opened_path_len) {
+ *opened_path_len = upath_len;
+
[PHP-CVS] cvs: php-src / README.UNICODE-UPGRADES
andrei Wed Jan 10 23:09:29 2007 UTC
Modified files:
/php-srcREADME.UNICODE-UPGRADES
Log:
Update with info from README.UNICODE.
http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE-UPGRADES?r1=1.14r2=1.15diff_format=u
Index: php-src/README.UNICODE-UPGRADES
diff -u php-src/README.UNICODE-UPGRADES:1.14
php-src/README.UNICODE-UPGRADES:1.15
--- php-src/README.UNICODE-UPGRADES:1.14Wed Dec 20 20:17:45 2006
+++ php-src/README.UNICODE-UPGRADES Wed Jan 10 23:09:28 2007
@@ -6,6 +6,151 @@
functionality and concepts without going into technical implementation
details.
+Internal Encoding
+=
+
+UTF-16 is the internal encoding used for Unicode strings. UTF-16 consumes
+two bytes for any Unicode character in the Basic Multilingual Plane, which
+is where most of the current world's languages are represented. While being
+less memory efficient for basic ASCII text it simplifies the processing and
+makes interfacing with ICU easier, since ICU uses UTF-16 for its internal
+processing as well.
+
+
+Zval Structure Changes
+==
+
+For IS_UNICODE type, we add another structure to the union:
+
+union {
+
+struct {
+UChar *val;/* Unicode string value */
+int len; /* number of UChar's */
+} ustr;
+
+} value;
+
+This cleanly separates the two types of strings and helps preserve backwards
+compatibility.
+
+To optimize access to IS_STRING and IS_UNICODE storage at runtime, we need yet
+another structure:
+
+union {
+
+struct {/* Universal string type */
+zstr val;
+int len;
+} uni;
+
+} value;
+
+Where zstr ia union of char*, UChar*, and void*.
+
+
+Parameter Parsing API Modifications
+===
+
+There are now five new specifiers: 'u', 't', 'T', 'U', 'S', 'x' and a new ''
+modifier.
+
+ 't' specifier
+ -
+ This specifier indicates that the caller requires the incoming parameter to
be
+ string data (IS_STRING, IS_UNICODE). The caller has to provide the storage
for
+ string value, length, and type.
+
+void *str;
+int len;
+zend_uchar type;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t, str, len,
type) == FAILURE) {
+return;
+}
+if (type == IS_UNICODE) {
+ /* process Unicode string */
+} else {
+ /* process binary string */
+}
+
+ For IS_STRING type, the length represents the number of bytes, and for
+ IS_UNICODE the number of UChar's. When converting other types (numbers,
+ booleans, etc) to strings, the exact behavior depends on the Unicode
semantics
+ switch: if on, they are converted to IS_UNICODE, otherwise to IS_STRING.
+
+
+ 'u' specifier
+ -
+ This specifier indicates that the caller requires the incoming parameter
+ to be a Unicode encoded string. If a non-Unicode string is passed, the engine
+ creates a copy of the string and automatically convert it to Unicode type
before
+ passing it to the internal function. No such conversion is necessary for
Unicode
+ strings, obviously.
+
+UChar *str;
+int len;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, u, str, len) ==
FAILURE) {
+return;
+}
+/* process Unicode string */
+
+
+ 'T' specifier
+ -
+ This specifier is useful when the function takes two or more strings and
+ operates on them. Using 't' specifier for each one would be somewhat
+ problematic if the passed-in strings are of mixed types, and multiple
+ checks need to be performed in order to do anything. All parameters
+ marked by the 'T' specifier are promoted to the same type.
+
+ If at least one of the 'T' parameters is of Unicode type, then the rest of
+ them are converted to IS_UNICODE. Otherwise all 'T' parameters are conveted
to
+ IS_STRING type.
+
+
+void *str1, *str2;
+int len1, len2;
+zend_uchar type1, type2;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, TT, str1, len1,
+ type1, str2, len2, type2) == FAILURE) {
+ return;
+}
+if (type1 == IS_UNICODE) {
+ /* process as Unicode, str2 is guaranteed to be Unicode as well */
+} else {
+ /* process as binary string, str2 is guaranteed to be the same */
+}
+
+
+ 'x' specifier
+ -
+ This specifier acts as either 'u' or 's', depending on the value of the
+ unicode semantics switch. If UG(unicode) is on, it behaves as 'u', and as
+ 's' otherwise.
+
+The existing 's' specifier has been modified as well. If a Unicode string is
+passed in, it automatically copies and converts the string to the runtime
+encoding, and issues a warning. If a binary type is passed-in, no conversion
+is necessary. The '' modifier can be used after 's' specifier to force
+a different converter instead.
+
+char *str;
+int
[PHP-CVS] cvs: php-src / README.UNICODE
andrei Wed Jan 10 23:16:40 2007 UTC
Modified files:
/php-srcREADME.UNICODE
Log:
Update with rewrites by me and Evan G.
http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE?r1=1.7r2=1.8diff_format=u
Index: php-src/README.UNICODE
diff -u php-src/README.UNICODE:1.7 php-src/README.UNICODE:1.8
--- php-src/README.UNICODE:1.7 Fri Dec 15 23:33:48 2006
+++ php-src/README.UNICODE Wed Jan 10 23:16:40 2007
@@ -1,133 +1,111 @@
+Audience
+
+
+This README describes how PHP 6 provides native support for the Unicode
+Standard. Readers of this document should be proficient with PHP and have a
+basic understanding of Unicode concepts. For more technical details about
+PHP 6 design principles and for guidelines about writing Unicode-ready PHP
+extensions, refer to README.UNICODE-UPGRADES.
+
Introduction
-As successful as PHP has proven to be in the past several years, it is still
-the only remaining member of the P-trinity of scripting languages - Perl and
-Python being the other two - that remains blithely ignorant of the
-multilingual and multinational environment around it. The software
-development community has been moving towards Unicode Standard for some time
-now, and PHP can no longer afford to be outside of this movement. Surely,
-some steps have been taken recently to allow for easier processing of
-multibyte data with the mbstring extension, but it is not enabled in PHP by
-default and is not as intuitive or transparent as it could be.
-
-The basic goal of this document is to describe how PHP 6 will support the
-Unicode Standard natively. Since the full implementation of the Unicode
-Standard is very involved, the idea is to use the already existing,
-well-tested, full-featured, and freely available ICU (International
-Components for Unicode) library. This will allow us to concentrate on the
-details of PHP integration and speed up the implementation.
+As successful as PHP has proven to be over the years, its support for
+multilingual and multinational environments has languished. PHP can no
+longer afford to remain outside the overall movement towards the Unicode
+standard. Although recent updates involving the mbstring extension have
+enabled easier multibyte data processing, this does not constitute native
+Unicode support.
+
+Since the full implementation of the Unicode Standard is very involved, our
+approach is to speed up implementation by using the well-tested,
+full-featured, and freely available ICU (International Components for
+Unicode) library.
+
General Remarks
===
-Backwards Compatibility
-Throughout the design and implementation of Unicode support, backwards
-compatibility must be of paramount concern. PHP is used on an enormous number
of
-sites and the upgrade to Unicode-enabled PHP has to be transparent. This means
-that the existing data types and functions must work as they have always
-done. However, the speed of certain operations may be affected, due to
-increased complexity of the code overall.
-
-Unicode Encoding
-
-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
-===
-
-The implementation is done in phases. This allows for more basic and
-low-level implementation issues to be ironed out and tested before
-proceeding to more advanced topics.
-
-Legend:
- - TODO
- + finished
- * in progress
-
- Phase I
- ---
-+ Basic Unicode string support, including instantiation, concatenation,
- indexing
-
-+ Simple output of Unicode strings via 'print' and 'echo' statements
- with appropriate output encoding conversion
-
-+ Conversion of Unicode strings to/from various encodings via encode() and
- decode() functions
-
-+ Determining length of Unicode strings via strlen() function, some
- simple string functions ported (substr).
-
+International Components for Unicode
+
- Phase II
-
-* HTTP input request decoding
+ICU (International Components for Unicode is a mature, widely used set of
+C/C++ and Java libraries for Unicode support, software internationalization
+and globalization. It provides:
+
+ - Encoding conversions
+ - Collations
+ - Unicode text processing
+ - and much more
+
+When building PHP 6, Unicode support is always enabled. The only
+configuration option during development should be the location of the ICU
+headers and libraries.
-+ Fixing remaining string-aware operators (assignment to [] etc)
-
-+ Support for Unicode and binary strings in PHP streams
-
-+ Support for Unicode identifiers
-
-+ Configurable handling of conversion failures
-
-+ \C{} escape sequence in strings
-
-
- Phase III
- -
-* Exposing ICU API
+ --with-icu-dir=dir
+
+where dir specifies the location of
[PHP-CVS] cvs: php-src / INSTALL Makefile.global acinclude.m4 configure.in makerpm /sapi/apache .cvsignore apMakefile.tmpl config.m4 libphp5.module.in libphp6.module.in mod_php.c mod_php.exp mod_php.
andrei Wed Jan 10 23:46:09 2007 UTC Added files: /php-src/sapi/apachelibphp6.module.in mod_php.c mod_php.exp mod_php.h Removed files: /php-src/sapi/apachelibphp5.module.in mod_php5.c mod_php5.exp mod_php5.h Modified files: /php-srcINSTALL Makefile.global acinclude.m4 configure.in makerpm /php-src/sapi/apache.cvsignore apMakefile.tmpl config.m4 php.sym php_apache_http.h /php-src/sapi/cli config.m4 Log: Rename php5 module to php6. Remove version number from sapi/apache/mod_php.* filenames (for future's sake). No other SAPI moduels modified (up to invididual maintainers). http://cvs.php.net/viewvc.cgi/php-src/INSTALL?r1=1.38r2=1.39diff_format=u Index: php-src/INSTALL diff -u php-src/INSTALL:1.38 php-src/INSTALL:1.39 --- php-src/INSTALL:1.38Mon Apr 10 15:09:14 2006 +++ php-src/INSTALL Wed Jan 10 23:46:08 2007 @@ -218,6 +218,10 @@ LoadModule php5_module libexec/libphp5.so +For PHP 6: + + LoadModule php6_module libexec/libphp6.so + 15. And in the AddModule section of httpd.conf, somewhere under the ClearModuleList, add this: @@ -467,6 +471,10 @@ LoadModule php5_module libexec/libphp5.so +For PHP 6: + + LoadModule php6_module libexec/libphp6.so + 15. Tell Apache to parse certain extensions as PHP. For example, let's have Apache parse the .php extension as PHP. You could have any extension(s) parse as PHP by simply adding more, with http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.69r2=1.70diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.69 php-src/Makefile.global:1.70 --- php-src/Makefile.global:1.69Sat Apr 8 17:34:57 2006 +++ php-src/Makefile.global Wed Jan 10 23:46:08 2007 @@ -13,22 +13,22 @@ build-modules: $(PHP_MODULES) -libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +libphp6.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la /dev/null 21 + [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp6.la $(phptempdir)/libphp6.la /dev/null 21 -libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ cp $@ libs/libphp5.so +libs/libphp6.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ cp $@ libs/libphp6.so install: $(all_targets) $(install_targets) install-sapi: $(OVERALL_TARGET) @echo Installing PHP SAPI module: $(PHP_SAPI) [EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir) - [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \ + [EMAIL PROTECTED] test ! -r $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ - if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \ + if test -r $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ + $(LN_S) $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); \ break; \ fi; \ done; \ @@ -108,10 +108,10 @@ find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f find . -name .libs -a -type d|xargs rm -rf - rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* + rm -f libphp6.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp + rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp6.module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*//'|xargs rm -f find . -name Makefile | xargs rm -f
[PHP-CVS] cvs: php-src /ext/posix posix.c /ext/standard filestat.c
pollita Thu Jan 11 01:52:24 2007 UTC
Modified files:
/php-src/ext/posix posix.c
/php-src/ext/standard filestat.c
Log:
Some platforms have getpwnam_r() but are missing _SC_GETPW_R_SIZE_MAX
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.87r2=1.88diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.87 php-src/ext/posix/posix.c:1.88
--- php-src/ext/posix/posix.c:1.87 Fri Jan 5 21:30:06 2007
+++ php-src/ext/posix/posix.c Thu Jan 11 01:52:24 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.87 2007/01/05 21:30:06 pollita Exp $ */
+/* $Id: posix.c,v 1.88 2007/01/11 01:52:24 pollita 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.87 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.88 $);
php_info_print_table_end();
}
/* }}} */
@@ -942,7 +942,7 @@
RETURN_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
buf = emalloc(buflen);
pw = pwbuf;
@@ -988,7 +988,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, uid) ==
FAILURE) {
RETURN_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
pwbuf = emalloc(pwbuflen);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.154r2=1.155diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.154
php-src/ext/standard/filestat.c:1.155
--- php-src/ext/standard/filestat.c:1.154 Mon Jan 1 09:29:31 2007
+++ php-src/ext/standard/filestat.c Thu Jan 11 01:52:24 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.154 2007/01/01 09:29:31 sebastian Exp $ */
+/* $Id: filestat.c,v 1.155 2007/01/11 01:52:24 pollita Exp $ */
#include php.h
#include fopen_wrappers.h
@@ -521,7 +521,7 @@
if (Z_TYPE_P(user) == IS_LONG) {
uid = (uid_t)Z_LVAL_P(user);
} else {
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
struct passwd pw;
struct passwd *retpwptr = NULL;
int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
--
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
pollita Thu Jan 11 02:31:50 2007 UTC
Modified files:
/php-src/ext/posix posix.c
Log:
#ifdef out the rest of that getpwuid_r() patch, see prior commit
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.88 php-src/ext/posix/posix.c:1.89
--- php-src/ext/posix/posix.c:1.88 Thu Jan 11 01:52:24 2007
+++ php-src/ext/posix/posix.c Thu Jan 11 02:31:50 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.88 2007/01/11 01:52:24 pollita Exp $ */
+/* $Id: posix.c,v 1.89 2007/01/11 02:31:50 pollita 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.88 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.89 $);
php_info_print_table_end();
}
/* }}} */
@@ -932,7 +932,7 @@
struct passwd *pw;
char *name;
int name_len;
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
struct passwd pwbuf;
int buflen;
char *buf;
@@ -965,7 +965,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, unable to convert
posix passwd struct to array);
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
efree(buf);
#endif
}
@@ -976,7 +976,7 @@
PHP_FUNCTION(posix_getpwuid)
{
long uid;
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
struct passwd _pw;
struct passwd *retpwptr = NULL;
int pwbuflen;
@@ -1012,7 +1012,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, unable to convert
posix passwd struct to array);
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
efree(pwbuf);
#endif
}
--
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 filestat.c
pollita Thu Jan 11 02:33:07 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard filestat.c
/php-src/ext/posix posix.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.7r2=1.136.2.8.2.8diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.7
php-src/ext/standard/filestat.c:1.136.2.8.2.8
--- php-src/ext/standard/filestat.c:1.136.2.8.2.7 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/filestat.c Thu Jan 11 02:33:07 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.7 2007/01/01 09:36:08 sebastian Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.8 2007/01/11 02:33:07 pollita Exp $ */
#include php.h
#include safe_mode.h
@@ -454,7 +454,7 @@
}
convert_to_string_ex(filename);
if (Z_TYPE_PP(user) == IS_STRING) {
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
struct passwd pw;
struct passwd *retpwptr = NULL;
int pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.70.2.3.2.10r2=1.70.2.3.2.11diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.70.2.3.2.10
php-src/ext/posix/posix.c:1.70.2.3.2.11
--- php-src/ext/posix/posix.c:1.70.2.3.2.10 Mon Jan 1 09:36:05 2007
+++ php-src/ext/posix/posix.c Thu Jan 11 02:33:07 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: posix.c,v 1.70.2.3.2.10 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: posix.c,v 1.70.2.3.2.11 2007/01/11 02:33:07 pollita 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.10 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.70.2.3.2.11 $);
php_info_print_table_end();
}
/* }}} */
@@ -932,7 +932,7 @@
struct passwd *pw;
char *name;
int name_len;
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
struct passwd pwbuf;
int buflen;
char *buf;
@@ -942,7 +942,7 @@
RETURN_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
buf = emalloc(buflen);
pw = pwbuf;
@@ -965,7 +965,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, unable to convert
posix passwd struct to array);
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWNAM_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
efree(buf);
#endif
}
@@ -976,7 +976,7 @@
PHP_FUNCTION(posix_getpwuid)
{
long uid;
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
struct passwd _pw;
struct passwd *retpwptr = NULL;
int pwbuflen;
@@ -988,7 +988,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, uid) ==
FAILURE) {
RETURN_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
pwbuf = emalloc(pwbuflen);
@@ -1012,7 +1012,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, unable to convert
posix passwd struct to array);
RETVAL_FALSE;
}
-#ifdef HAVE_GETPWUID_R
+#if defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWUID_R)
efree(pwbuf);
#endif
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
