[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Nov 4 01:45:28 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2153r2=1.2154ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2153 php-src/ChangeLog:1.2154 --- php-src/ChangeLog:1.2153Thu Nov 3 01:45:10 2005 +++ php-src/ChangeLog Fri Nov 4 01:45:21 2005 @@ -1,3 +1,97 @@ +2005-11-03 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + ext/sqlite/tests/sqlite_oo_030.phpt: + - Fix test expectations - we are no detecting the error earlier + +* (PHP_5_1) + ZendEngine2/zend_API.c: + - Fix static check in zend_is_callable_ex() + - Fix/speedup zend_make_callable() + +2005-11-03 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + NEWS + ext/ldap/config.m4 + ext/ldap/config.m4: + MFH: - Fixed bug #35078 (configure does not find ldap_start_tls_s) + +* ext/ldap/config.m4: + - Fixed bug #35078 (configure does not find ldap_start_tls_s) + +* (PHP_4_4) + NEWS: + BFN + +2005-11-03 Greg Beaver [EMAIL PROTECTED] + +* (PHP_4_4) + pear/package-PEAR.xml + pear/package2.xml: + solve cvs sync issue permanently: the PEAR files in php-src/pear branch + PHP_4_4 will *only* be used to install PEAR. The packages, including PEAR + will be in packages/ + +* pear/packages/PEAR-1.4.3.tar + pear/packages/PEAR-1.4.3.tar: + + file PEAR-1.4.3.tar was initially added on branch PHP_4_4. + +2005-11-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + ext/imap/php_imap.c: + Syncornize code with CS/error handling from 5.X + MFH crash fixes for imap_mailcompose function. + +* (PHP_5_1) + NEWS: + Fixed typo. + +2005-11-03 Michael Wallner [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ext/sockets/sockets.c + ext/sockets/sockets.c: + - MFB44: #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer +parameter on Windows) + +* (PHP_4_4) + NEWS + ext/sockets/sockets.c: + - fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect + integer +parameter on Windows) + +2005-11-03 Greg Beaver [EMAIL PROTECTED] + +* (PHP_4_4) + pear/PEAR/Config.php: + merge changes from pear-core + +* pear/packages/Console_Getopt-1.2.tar + pear/packages/Console_Getopt-1.2.tar: + + file Console_Getopt-1.2.tar was initially added on branch PHP_4_4. + +* (PHP_4_4) + pear/package-Archive_Tar.xml + pear/package-Console_Getopt.xml: + remove unneeded xml files, will use tarballs to install + +* pear/packages/Archive_Tar-1.3.1.tar + pear/packages/Archive_Tar-1.3.1.tar: + + file Archive_Tar-1.3.1.tar was initially added on branch PHP_4_4. + +* (PHP_4_4) + pear/packages/XML_RPC-1.4.0.tar: + remove optional XML_RPC dependency from default install + 2005-11-02 Jani Taskinen [EMAIL PROTECTED] * ext/gd/php_gd.h: @@ -15718,7 +15812,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2153 2005/11/03 06:45:10 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2154 2005/11/04 06:45:21 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -19119,7 +19213,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2153 2005/11/03 06:45:10 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2154 2005/11/04 06:45:21 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -19600,7 +19694,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2153 2005/11/03 06:45:10 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2154 2005/11/04 06:45:21 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -21074,7 +21168,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2153 2005/11/03 06:45:10 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2154 2005/11/04 06:45:21 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Nov 4 01:46:22 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.805r2=1.806ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.805 ZendEngine2/ChangeLog:1.806 --- ZendEngine2/ChangeLog:1.805 Thu Nov 3 01:46:29 2005 +++ ZendEngine2/ChangeLog Fri Nov 4 01:46:21 2005 @@ -1,3 +1,10 @@ +2005-11-03 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + zend_API.c: + - Fix static check in zend_is_callable_ex() + - Fix/speedup zend_make_callable() + 2005-11-02 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_1) @@ -10993,7 +11000,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.805 2005/11/03 06:46:29 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.806 2005/11/04 06:46:21 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12717,7 +12724,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.805 2005/11/03 06:46:29 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.806 2005/11/04 06:46:21 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/sockets sockets.c
mikeThu Nov 3 10:00:51 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/socketssockets.c
Log:
- MFB44: #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer
parameter on Windows)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.173r2=1.2027.2.174ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.173 php-src/NEWS:1.2027.2.174
--- php-src/NEWS:1.2027.2.173 Wed Nov 2 10:53:47 2005
+++ php-src/NEWSThu Nov 3 10:00:48 2005
@@ -7,6 +7,8 @@
- Fixed bug #35017 (Exception thrown in error handler may cause unexpected
behavior). (Dmitry)
- Fixed bug #35014 (array_product() always returns 0). (Ilia)
+- Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer
+ parameter on Windows). (Mike)
28 Oct 2005, PHP 5.1 Release Candidate 4
- Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171.2.1r2=1.171.2.2ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.1
php-src/ext/sockets/sockets.c:1.171.2.2
--- php-src/ext/sockets/sockets.c:1.171.2.1 Fri Sep 23 05:54:31 2005
+++ php-src/ext/sockets/sockets.c Thu Nov 3 10:00:51 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171.2.1 2005/09/23 09:54:31 hyanantha Exp $ */
+/* $Id: sockets.c,v 1.171.2.2 2005/11/03 15:00:51 mike Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1506,6 +1506,7 @@
zval*arg1;
struct linger linger_val;
struct timeval tv;
+ int timeout = 0;
socklen_t optlen;
php_socket *php_sock;
int other_val;
@@ -1533,12 +1534,24 @@
break;
case SO_RCVTIMEO:
case SO_SNDTIMEO:
+#ifndef PHP_WIN32
optlen = sizeof(tv);
if (getsockopt(php_sock-bsd_socket, level, optname,
(char*)tv, optlen) != 0) {
PHP_SOCKET_ERROR(php_sock, unable to retrieve
socket option, errno);
RETURN_FALSE;
}
+#else
+ optlen = sizeof(int);
+
+ if (getsockopt(php_sock-bsd_socket, level, optname,
(char*)timeout, optlen) != 0) {
+ PHP_SOCKET_ERROR(php_sock, unable to retrieve
socket option, errno);
+ RETURN_FALSE;
+ }
+
+ tv.tv_sec = timeout ? timeout / 1000 : 0;
+ tv.tv_usec = timeout ? (timeout * 1000) % 100 : 0;
+#endif
array_init(return_value);
@@ -1568,7 +1581,7 @@
struct linger lv;
struct timeval tv;
php_socket *php_sock;
- int ov, optlen, retval;
+ int ov, optlen, retval, timeout;
longlevel, optname;
void*opt_ptr;
@@ -1628,11 +1641,16 @@
convert_to_long_ex(sec);
convert_to_long_ex(usec);
+#ifndef PHP_WIN32
tv.tv_sec = Z_LVAL_PP(sec);
tv.tv_usec = Z_LVAL_PP(usec);
-
optlen = sizeof(tv);
opt_ptr = tv;
+#else
+ timeout = Z_LVAL_PP(sec) * 1000 + Z_LVAL_PP(usec) /
1000;
+ optlen = sizeof(int);
+ opt_ptr = timeout;
+#endif
break;
default:
convert_to_long_ex(arg4);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets sockets.c
mikeThu Nov 3 10:01:31 2005 EDT
Modified files:
/php-src/ext/socketssockets.c
Log:
- MFB44: #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer
parameter on Windows)
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171r2=1.172ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171 php-src/ext/sockets/sockets.c:1.172
--- php-src/ext/sockets/sockets.c:1.171 Wed Aug 3 10:07:52 2005
+++ php-src/ext/sockets/sockets.c Thu Nov 3 10:01:31 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171 2005/08/03 14:07:52 sniper Exp $ */
+/* $Id: sockets.c,v 1.172 2005/11/03 15:01:31 mike Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1504,6 +1504,7 @@
zval*arg1;
struct linger linger_val;
struct timeval tv;
+ int timeout = 0;
socklen_t optlen;
php_socket *php_sock;
int other_val;
@@ -1531,12 +1532,24 @@
break;
case SO_RCVTIMEO:
case SO_SNDTIMEO:
+#ifndef PHP_WIN32
optlen = sizeof(tv);
if (getsockopt(php_sock-bsd_socket, level, optname,
(char*)tv, optlen) != 0) {
PHP_SOCKET_ERROR(php_sock, unable to retrieve
socket option, errno);
RETURN_FALSE;
}
+#else
+ optlen = sizeof(int);
+
+ if (getsockopt(php_sock-bsd_socket, level, optname,
(char*)timeout, optlen) != 0) {
+ PHP_SOCKET_ERROR(php_sock, unable to retrieve
socket option, errno);
+ RETURN_FALSE;
+ }
+
+ tv.tv_sec = timeout ? timeout / 1000 : 0;
+ tv.tv_usec = timeout ? (timeout * 1000) % 100 : 0;
+#endif
array_init(return_value);
@@ -1566,7 +1579,7 @@
struct linger lv;
struct timeval tv;
php_socket *php_sock;
- int ov, optlen, retval;
+ int ov, optlen, retval, timeout;
longlevel, optname;
void*opt_ptr;
@@ -1626,11 +1639,16 @@
convert_to_long_ex(sec);
convert_to_long_ex(usec);
+#ifndef PHP_WIN32
tv.tv_sec = Z_LVAL_PP(sec);
tv.tv_usec = Z_LVAL_PP(usec);
-
optlen = sizeof(tv);
opt_ptr = tv;
+#else
+ timeout = Z_LVAL_PP(sec) * 1000 + Z_LVAL_PP(usec) /
1000;
+ optlen = sizeof(int);
+ opt_ptr = timeout;
+#endif
break;
default:
convert_to_long_ex(arg4);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Thu Nov 3 10:01:31 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed typo. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.174r2=1.2027.2.175ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.174 php-src/NEWS:1.2027.2.175 --- php-src/NEWS:1.2027.2.174 Thu Nov 3 10:00:48 2005 +++ php-src/NEWSThu Nov 3 10:01:30 2005 @@ -44,7 +44,7 @@ - Fixed bug #33760 (cURL needs to implement CRYPTO_callback functions to prevent locking). (Mike, Ilia) - Fixed bug #31341 (escape on curly inconsistent). (Dmitry) -- Fixed bug #31177 (menory leaks and corruption because of incorrect +- Fixed bug #31177 (memory leaks and corruption because of incorrect refcounting). (Dmitry) - Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia) - Fixed bug #29268 (__autoload() not called with Reflection-getClass()). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/imap php_imap.c
iliaa Thu Nov 3 10:57:08 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/ext/imap php_imap.c
Log:
Syncornize code with CS/error handling from 5.X
MFH crash fixes for imap_mailcompose function.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.68r2=1.1247.2.920.2.69ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.68 php-src/NEWS:1.1247.2.920.2.69
--- php-src/NEWS:1.1247.2.920.2.68 Thu Nov 3 09:58:38 2005
+++ php-src/NEWSThu Nov 3 10:57:00 2005
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? 2006, Version 4.4.2
+- Backport missing imap_mailcompose fixes from 5.X. (Ilia)
- Missing safe_mode/open_basedir check in cURL extension. (Ilia)
- Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia)
- Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.142.2.44r2=1.142.2.44.2.1ty=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.142.2.44
php-src/ext/imap/php_imap.c:1.142.2.44.2.1
--- php-src/ext/imap/php_imap.c:1.142.2.44 Fri Apr 8 11:04:52 2005
+++ php-src/ext/imap/php_imap.c Thu Nov 3 10:57:04 2005
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_imap.c,v 1.142.2.44 2005/04/08 15:04:52 iliaa Exp $ */
+/* $Id: php_imap.c,v 1.142.2.44.2.1 2005/11/03 15:57:04 iliaa Exp $ */
#define IMAP41
@@ -51,7 +51,7 @@
#include signal.h
#ifdef PHP_WIN32
-#include winsock.h
+#include winsock2.h
#include stdlib.h
#include win32/sendmail.h
MAILSTREAM DEFAULTPROTO;
@@ -348,21 +348,15 @@
void mail_getquota(MAILSTREAM *stream, char *qroot, QUOTALIST *qlist)
{
- zval *t_map;
- zval *return_value;
+ zval *t_map, *return_value;
TSRMLS_FETCH();
-
- return_value = *IMAPG(quota_return);
+ return_value = *IMAPG(quota_return);
+
/* put parsing code here */
for(; qlist; qlist = qlist-next) {
MAKE_STD_ZVAL(t_map);
- if (array_init(t_map) == FAILURE) {
- php_error(E_WARNING, Unable to allocate t_map memory);
- FREE_ZVAL(t_map);
- FREE_ZVAL(IMAPG(quota_return));
- return;
- }
+ array_init(t_map);
if (strncmp(qlist-name, STORAGE, 7) == 0)
{
/* this is to add backwards compatibility */
@@ -652,7 +646,7 @@
if (EG(error_reporting) E_NOTICE) {
ecur = IMAPG(imap_errorstack);
while (ecur != NIL) {
- php_error(E_NOTICE, %s(): %s (errflg=%ld),
get_active_function_name(TSRMLS_C), ecur-LTEXT, ecur-errflg);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, %s
(errflg=%ld), ecur-LTEXT, ecur-errflg);
ecur = ecur-next;
}
}
@@ -664,7 +658,7 @@
if (EG(error_reporting) E_NOTICE) {
acur = IMAPG(imap_alertstack);
while (acur != NIL) {
- php_error(E_NOTICE, %s(): %s,
get_active_function_name(TSRMLS_C), acur-LTEXT);
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
%s, acur-LTEXT);
acur = acur-next;
}
}
@@ -743,7 +737,7 @@
imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags);
if (imap_stream == NIL) {
- php_error(E_WARNING, %s(): Couldn't open stream %s,
get_active_function_name(TSRMLS_C), Z_STRVAL_PP(mailbox));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't open
stream %s, Z_STRVAL_PP(mailbox));
efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
RETURN_FALSE;
@@ -795,7 +789,7 @@
}
imap_stream = mail_open(imap_le_struct-imap_stream,
Z_STRVAL_PP(mailbox), flags);
if (imap_stream == NIL) {
- php_error(E_WARNING, %s(): Couldn't re-open stream,
get_active_function_name(TSRMLS_C));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't re-open
stream);
RETURN_FALSE;
}
imap_le_struct-imap_stream = imap_stream;
@@ -903,7 +897,7 @@
convert_to_string_ex(qroot);
array_init(return_value);
- IMAPG(quota_return) = return_value;
+ IMAPG(quota_return) = return_value;
/* set the callback for the GET_QUOTA function */
mail_parameters(NIL,
[PHP-CVS] cvs: php-src(PHP_4_4) /pear package-PEAR.xml package2.xml /pear/packages PEAR-1.4.3.tar
cellog Thu Nov 3 14:33:47 2005 EDT Added files: (Branch: PHP_4_4) /php-src/pear/packages PEAR-1.4.3.tar Removed files: /php-src/pear package-PEAR.xml package2.xml Log: solve cvs sync issue permanently: the PEAR files in php-src/pear branch PHP_4_4 will *only* be used to install PEAR. The packages, including PEAR will be in packages/ http://cvs.php.net/co.php/php-src/pear/packages/PEAR-1.4.3.tar?r=1.1p=1 Index: php-src/pear/packages/PEAR-1.4.3.tar +++ php-src/pear/packages/PEAR-1.4.3.tar -- 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/gd gd.c gd_ctx.c php_gd.h
sniper Thu Nov 3 15:20:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/gd gd.c gd_ctx.c php_gd.h
Log:
MFH: added missing safe-mode checks
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.221.2.56.2.2r2=1.221.2.56.2.3ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.221.2.56.2.2 php-src/ext/gd/gd.c:1.221.2.56.2.3
--- php-src/ext/gd/gd.c:1.221.2.56.2.2 Thu Oct 27 06:29:31 2005
+++ php-src/ext/gd/gd.c Thu Nov 3 15:20:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.221.2.56.2.2 2005/10/27 10:29:31 tony2001 Exp $ */
+/* $Id: gd.c,v 1.221.2.56.2.3 2005/11/03 20:20:04 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -623,7 +623,7 @@
convert_to_string_ex(file);
- stream = php_stream_open_wrapper(Z_STRVAL_PP(file), rb, IGNORE_PATH |
IGNORE_URL_WIN | REPORT_ERRORS, NULL);
+ stream = php_stream_open_wrapper(Z_STRVAL_PP(file), rb,
ENFORCE_SAFE_MODE | IGNORE_PATH | IGNORE_URL_WIN | REPORT_ERRORS, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -1440,7 +1440,7 @@
fn = Z_STRVAL_PP(file);
- stream = php_stream_open_wrapper(fn, rb,
REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
+ stream = php_stream_open_wrapper(fn, rb,
ENFORCE_SAFE_MODE|REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -1648,10 +1648,7 @@
}
if ((argc == 2) || (argc 2 Z_STRLEN_PP(file))) {
- if (!fn || fn == empty_string || php_check_open_basedir(fn
TSRMLS_CC) || (PG(safe_mode) !php_checkuid(fn, rb+,
CHECKUID_CHECK_FILE_AND_DIR))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
filename '%s', fn);
- RETURN_FALSE;
- }
+ PHP_GD_CHECK_OPEN_BASEDIR(fn, Invalid filename);
fp = VCWD_FOPEN(fn, wb);
if (!fp) {
@@ -3746,16 +3743,10 @@
}
/* Check origin file */
- if (!fn_org || fn_org == empty_string || php_check_open_basedir(fn_org
TSRMLS_CC)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid origin
filename '%s', fn_org);
- RETURN_FALSE;
- }
+ PHP_GD_CHECK_OPEN_BASEDIR(fn_org, Invalid origin filename);
/* Check destination file */
- if (!fn_dest || fn_dest == empty_string ||
php_check_open_basedir(fn_dest TSRMLS_CC)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
destination filename '%s', fn_dest);
- RETURN_FALSE;
- }
+ PHP_GD_CHECK_OPEN_BASEDIR(fn_dest, Invalid destination filename);
/* Open origin file */
org = VCWD_FOPEN(fn_org, rb);
http://cvs.php.net/diff.php/php-src/ext/gd/gd_ctx.c?r1=1.15.2.2.4.1r2=1.15.2.2.4.2ty=u
Index: php-src/ext/gd/gd_ctx.c
diff -u php-src/ext/gd/gd_ctx.c:1.15.2.2.4.1
php-src/ext/gd/gd_ctx.c:1.15.2.2.4.2
--- php-src/ext/gd/gd_ctx.c:1.15.2.2.4.1Thu Oct 6 16:44:52 2005
+++ php-src/ext/gd/gd_ctx.c Thu Nov 3 15:20:10 2005
@@ -73,10 +73,7 @@
}
if ((argc == 2) || (argc 2 Z_STRLEN_PP(file))) {
- if (!fn || fn == empty_string || php_check_open_basedir(fn
TSRMLS_CC) || (PG(safe_mode) !php_checkuid(fn, rb+,
CHECKUID_CHECK_FILE_AND_DIR))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
filename '%s', fn);
- RETURN_FALSE;
- }
+ PHP_GD_CHECK_OPEN_BASEDIR(fn, Invalid filename);
fp = VCWD_FOPEN(fn, wb);
if (!fp) {
http://cvs.php.net/diff.php/php-src/ext/gd/php_gd.h?r1=1.44.2.5r2=1.44.2.5.8.1ty=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.44.2.5 php-src/ext/gd/php_gd.h:1.44.2.5.8.1
--- php-src/ext/gd/php_gd.h:1.44.2.5Mon Mar 31 03:49:30 2003
+++ php-src/ext/gd/php_gd.h Thu Nov 3 15:20:10 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_gd.h,v 1.44.2.5 2003/03/31 08:49:30 sniper Exp $ */
+/* $Id: php_gd.h,v 1.44.2.5.8.1 2005/11/03 20:20:10 sniper Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -30,6 +30,15 @@
#if HAVE_LIBGD
+/* open_basedir and safe_mode checks */
+#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg)
\
+ if (!filename || filename == empty_string ||
php_check_open_basedir(filename TSRMLS_CC) || \
+ (PG(safe_mode) !php_checkuid(filename, rb+,
CHECKUID_CHECK_FILE_AND_DIR)) \
+ ) {
\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg);
\
+ RETURN_FALSE;
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
sniper Thu Nov 3 15:31:12 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.69r2=1.1247.2.920.2.70ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.69 php-src/NEWS:1.1247.2.920.2.70 --- php-src/NEWS:1.1247.2.920.2.69 Thu Nov 3 10:57:00 2005 +++ php-src/NEWSThu Nov 3 15:30:59 2005 @@ -2,15 +2,16 @@ ||| ?? ??? 2006, Version 4.4.2 - Backport missing imap_mailcompose fixes from 5.X. (Ilia) -- Missing safe_mode/open_basedir check in cURL extension. (Ilia) +- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia) +- Fixed bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani) - Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia) - Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia) -- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is - zero). (Tony) +- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is zero). + (Tony) - Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer parameter on Windows). (Mike) -- Fixed bug #33760 (cURL needs to implement CRYPTO_callback functions to prevent - locking). (Mike) +- Fixed bug #33760 (cURL needs CRYPTO_callback functions to prevent locking). + (Mike) 31 Oct 2005, Version 4.4.1 - Added missing safe_mode checks for image* functions and cURL. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap config.m4
sniper Thu Nov 3 15:41:07 2005 EDT Modified files: /php-src/ext/ldap config.m4 Log: - Fixed bug #35078 (configure does not find ldap_start_tls_s) http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.41r2=1.42ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.41 php-src/ext/ldap/config.m4:1.42 --- php-src/ext/ldap/config.m4:1.41 Mon Oct 24 18:45:54 2005 +++ php-src/ext/ldap/config.m4 Thu Nov 3 15:41:05 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.41 2005/10/24 22:45:54 sniper Exp $ +dnl $Id: config.m4,v 1.42 2005/11/03 20:41:05 sniper Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -156,23 +156,24 @@ PHP_ADD_INCLUDE($LDAP_INCDIR) PHP_SUBST(LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_LDAP,1,[ ]) - - dnl Check for 3 arg ldap_set_rebind_proc + + dnl Save original values _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LDFLAGS=$LDFLAGS CPPFLAGS=$CPPFLAGS -I$LDAP_INCDIR + LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD + + dnl Check for 3 arg ldap_set_rebind_proc AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, [AC_TRY_COMPILE([#include ldap.h], [ldap_set_rebind_proc(0,0,0)], ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) if test $ac_cv_3arg_setrebindproc = yes; then AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()]) fi - CPPFLAGS=$_SAVE_CPPFLAGS dnl Solaris 2.8 claims to be 2004 API, but doesn't have dnl ldap_parse_reference() nor ldap_start_tls_s() AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s]) - LDFLAGS=$_SAVE_LDFLAGS dnl dnl SASL check @@ -184,10 +185,11 @@ dnl dnl Sanity check dnl - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD AC_CHECK_FUNC(ldap_bind_s, [], [ AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.]) ]) + + dnl Restore original values + CPPFLAGS=$_SAVE_CPPFLAGS LDFLAGS=$_SAVE_LDFLAGS fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/ldap config.m4
sniper Thu Nov 3 15:41:14 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/ext/ldap config.m4 Log: MFH: - Fixed bug #35078 (configure does not find ldap_start_tls_s) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.175r2=1.2027.2.176ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.175 php-src/NEWS:1.2027.2.176 --- php-src/NEWS:1.2027.2.175 Thu Nov 3 10:01:30 2005 +++ php-src/NEWSThu Nov 3 15:41:12 2005 @@ -2,6 +2,7 @@ ||| ?? Nov 2005, PHP 5.1 - Fixed initializing and argument checking for posix_mknod(). (Derick) +- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani) - Fixed bugs #35022, #35019 (Regression in the behavior of key() and current() functions). (Ilia) - Fixed bug #35017 (Exception thrown in error handler may cause unexpected http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.4r2=1.39.2.5ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.39.2.4 php-src/ext/ldap/config.m4:1.39.2.5 --- php-src/ext/ldap/config.m4:1.39.2.4 Mon Oct 24 18:46:26 2005 +++ php-src/ext/ldap/config.m4 Thu Nov 3 15:41:13 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.39.2.4 2005/10/24 22:46:26 sniper Exp $ +dnl $Id: config.m4,v 1.39.2.5 2005/11/03 20:41:13 sniper Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -156,23 +156,24 @@ PHP_ADD_INCLUDE($LDAP_INCDIR) PHP_SUBST(LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_LDAP,1,[ ]) - - dnl Check for 3 arg ldap_set_rebind_proc + + dnl Save original values _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LDFLAGS=$LDFLAGS CPPFLAGS=$CPPFLAGS -I$LDAP_INCDIR + LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD + + dnl Check for 3 arg ldap_set_rebind_proc AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, [AC_TRY_COMPILE([#include ldap.h], [ldap_set_rebind_proc(0,0,0)], ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) if test $ac_cv_3arg_setrebindproc = yes; then AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()]) fi - CPPFLAGS=$_SAVE_CPPFLAGS dnl Solaris 2.8 claims to be 2004 API, but doesn't have dnl ldap_parse_reference() nor ldap_start_tls_s() AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s]) - LDFLAGS=$_SAVE_LDFLAGS dnl dnl SASL check @@ -184,10 +185,11 @@ dnl dnl Sanity check dnl - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD AC_CHECK_FUNC(ldap_bind_s, [], [ AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.]) ]) + + dnl Restore original values + CPPFLAGS=$_SAVE_CPPFLAGS LDFLAGS=$_SAVE_LDFLAGS fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/ldap config.m4
sniper Thu Nov 3 15:41:57 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS /php-src/ext/ldap config.m4 Log: MFH: - Fixed bug #35078 (configure does not find ldap_start_tls_s) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.70r2=1.1247.2.920.2.71ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.70 php-src/NEWS:1.1247.2.920.2.71 --- php-src/NEWS:1.1247.2.920.2.70 Thu Nov 3 15:30:59 2005 +++ php-src/NEWSThu Nov 3 15:41:54 2005 @@ -3,6 +3,7 @@ ?? ??? 2006, Version 4.4.2 - Backport missing imap_mailcompose fixes from 5.X. (Ilia) - Added missing safe_mode/open_basedir checks in cURL extension. (Ilia) +- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani) - Fixed bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani) - Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia) - Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia) http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.26.2.8r2=1.26.2.8.2.1ty=u Index: php-src/ext/ldap/config.m4 diff -u php-src/ext/ldap/config.m4:1.26.2.8 php-src/ext/ldap/config.m4:1.26.2.8.2.1 --- php-src/ext/ldap/config.m4:1.26.2.8 Sun May 8 12:06:24 2005 +++ php-src/ext/ldap/config.m4 Thu Nov 3 15:41:56 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.26.2.8 2005/05/08 16:06:24 sniper Exp $ +dnl $Id: config.m4,v 1.26.2.8.2.1 2005/11/03 20:41:56 sniper Exp $ dnl AC_DEFUN([PHP_LDAP_CHECKS], [ @@ -110,30 +110,32 @@ PHP_SUBST(LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_LDAP,1,[ ]) - dnl Check for 3 arg ldap_set_rebind_proc + dnl Save original values _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LDFLAGS=$LDFLAGS + LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD CPPFLAGS=$CPPFLAGS -I$LDAP_INCDIR + + dnl Check for 3 arg ldap_set_rebind_proc AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, [AC_TRY_COMPILE([#include ldap.h], [ldap_set_rebind_proc(0,0,0)], ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) if test $ac_cv_3arg_setrebindproc = yes; then AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()]) fi - CPPFLAGS=$_SAVE_CPPFLAGS dnl Solaris 2.8 claims to be 2004 API, but doesn't have dnl ldap_parse_reference() nor ldap_start_tls_s() AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s]) - LDFLAGS=$_SAVE_LDFLAGS dnl dnl Sanity check dnl - _SAVE_LDFLAGS=$LDFLAGS - LDFLAGS=$LDFLAGS $LDAP_SHARED_LIBADD AC_CHECK_FUNC(ldap_bind_s, [], [ AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.]) ]) + + dnl Restore original values + CPPFLAGS=$_SAVE_CPPFLAGS LDFLAGS=$_SAVE_LDFLAGS fi -- 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_0) / NEWS /sapi/aolserver aolserver.c /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c /sapi/nsapi nsapi.c
On Mon, 4 Jul 2005, Dmitry Stogov wrote:
dmitryMon Jul 4 08:47:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handler apache_config.c
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed)
Shouldn't this fix also be merged to the 4_4 branch?
regards,
Derick
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447r2=1.1760.2.448ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448
--- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005
+++ php-src/NEWS Mon Jul 4 08:47:26 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33520 (crash if safe_mode is on and session.save_path is
changed).
+ (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.77r2=1.77.2.1ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.77.2.1
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.cMon Jul 4 08:47:26 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77 2004/01/08 08:18:02 andi Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77.2.1 2005/07/04 12:47:26 dmitry Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path, Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path, Ns_InfoErrorLog());
@@ -549,7 +549,7 @@
Ns_Log(Debug, PHP configuration option
'%s=%s', new_key, val);
zend_alter_ini_entry(new_key, strlen(new_key) +
1, val,
- strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
efree(new_key);
}
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c?r1=1.32r2=1.32.2.1ty=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.32
php-src/sapi/apache2filter/apache_config.c:1.32.2.1
--- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan 8 03:18:04 2004
+++ php-src/sapi/apache2filter/apache_config.cMon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */
+/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -178,7 +178,7 @@
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str, data-value));
if (zend_alter_ini_entry(str, str_len, data-value,
data-value_len,
- data-status, PHP_INI_STAGE_RUNTIME) ==
FAILURE) {
+ data-status, PHP_INI_STAGE_ACTIVATE)
== FAILURE) {
phpapdebug((stderr, ..FAILED\n));
}
}
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.c?r1=1.5r2=1.5.2.1ty=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.5
php-src/sapi/apache2handler/apache_config.c:1.5.2.1
--- php-src/sapi/apache2handler/apache_config.c:1.5 Thu Jan 8 03:18:05 2004
+++ php-src/sapi/apache2handler/apache_config.c Mon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.5 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: apache_config.c,v 1.5.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -166,7 +166,7 @@
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
helly Thu Nov 3 16:28:30 2005 EDT
Modified files:
/php-src/ext/splphp_spl.c
Log:
- Add missing check
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.72r2=1.73ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.72 php-src/ext/spl/php_spl.c:1.73
--- php-src/ext/spl/php_spl.c:1.72 Sat Oct 29 11:10:55 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 16:28:16 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.72 2005/10/29 15:10:55 helly Exp $ */
+/* $Id: php_spl.c,v 1.73 2005/11/03 21:28:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -399,7 +399,7 @@
}
zval_dtor(zfunc_name);
return;
- } else if (!obj_ptr !(alfi.func_ptr-common.fn_flags
ZEND_ACC_STATIC)) {
+ } else if (!obj_ptr alfi.func_ptr
!(alfi.func_ptr-common.fn_flags ZEND_ACC_STATIC)) {
if (do_throw) {
zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_LogicException), 0 TSRMLS_CC,
Passed array specifies a non static method but no object);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl php_spl.c
helly Thu Nov 3 16:28:43 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splphp_spl.c
Log:
- MFH Add missing check
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.11r2=1.52.2.12ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.11 php-src/ext/spl/php_spl.c:1.52.2.12
--- php-src/ext/spl/php_spl.c:1.52.2.11 Wed Nov 2 15:31:01 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 16:28:43 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.11 2005/11/02 20:31:01 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.12 2005/11/03 21:28:43 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -404,7 +404,7 @@
if (!zend_is_callable_ex(zcallable, 0, func_name,
func_name_len, alfi.ce, alfi.func_ptr, obj_ptr TSRMLS_CC)) {
if (Z_TYPE_P(zcallable) == IS_ARRAY) {
- if (!obj_ptr
!(alfi.func_ptr-common.fn_flags ZEND_ACC_STATIC)) {
+ if (!obj_ptr alfi.func_ptr
!(alfi.func_ptr-common.fn_flags ZEND_ACC_STATIC)) {
if (do_throw) {
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, Passed array
specifies a non static method but no object);
}
--
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_0) / NEWS /sapi/aolserver aolserver.c/sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c/sapi/nsapi nsapi.c
Hi Derick,
I really don't know.
It was very long time ago.
Thanks. Dmitry.
-Original Message-
From: Derick Rethans [mailto:[EMAIL PROTECTED]
Sent: Friday, November 04, 2005 12:01 AM
To: Dmitry Stogov
Cc: php-cvs@lists.php.net
Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
/sapi/aolserver aolserver.c/sapi/apache2filter
apache_config.c /sapi/apache2handler
apache_config.c/sapi/nsapi nsapi.c
On Mon, 4 Jul 2005, Dmitry Stogov wrote:
dmitry Mon Jul 4 08:47:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handlerapache_config.c
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #33520 (crash if safe_mode is on and
session.save_path is
changed)
Shouldn't this fix also be merged to the 4_4 branch?
regards,
Derick
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447r2=1.1760.2.4
48ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448
--- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005
+++ php-src/NEWSMon Jul 4 08:47:26 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems.
(Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw
exception. (Tony)
+- Fixed bug #33520 (crash if safe_mode is on and
session.save_path is
+changed).
+ (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class).
(Tony)
- Fixed bug #33340 (CLI Crash when calling php:function
from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child
class). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c
?r1=1.77r2=1.77.2.1ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.77.2.1
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.c Mon Jul 4 08:47:26 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version,
$Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id:
+aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path,
Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path,
Ns_InfoErrorLog()); @@
-549,7 +549,7 @@
Ns_Log(Debug, PHP
configuration option '%s=%s', new_key, val);
zend_alter_ini_entry(new_key,
strlen(new_key) + 1, val,
- strlen(val) +
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ strlen(val) +
1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
efree(new_key);
}
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c
?r1=1.32r2=1.32.2.1ty=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.32
php-src/sapi/apache2filter/apache_config.c:1.32.2.1
--- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan
8 03:18:04 2004
+++ php-src/sapi/apache2filter/apache_config.c Mon Jul
4 08:47:26 2005
@@ -16,7 +16,7 @@
+-
-+
*/
-/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */
+/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26
dmitry Exp $
+*/
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -178,7 +178,7 @@
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str,
data-value));
if (zend_alter_ini_entry(str, str_len,
data-value, data-value_len,
- data-status,
PHP_INI_STAGE_RUNTIME) == FAILURE) {
+ data-status,
PHP_INI_STAGE_ACTIVATE) == FAILURE) {
phpapdebug((stderr, ..FAILED\n));
}
}
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.
c?r1=1.5r2=1.5.2.1ty=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.5
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
helly Thu Nov 3 16:58:44 2005 EDT
Modified files:
/php-src/ext/splphp_spl.c
Log:
- Tray fixing #35088
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.73r2=1.74ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.73 php-src/ext/spl/php_spl.c:1.74
--- php-src/ext/spl/php_spl.c:1.73 Thu Nov 3 16:28:16 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 16:58:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.73 2005/11/03 21:28:16 helly Exp $ */
+/* $Id: php_spl.c,v 1.74 2005/11/03 21:58:42 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -448,7 +448,11 @@
zend_hash_find(EG(function_table), spl_autoload,
sizeof(spl_autoload), (void **) spl_func_ptr);
if (EG(autoload_func) == spl_func_ptr) { /* registered already,
so we insert that first */
- autoload_func_info spl_alfi = {spl_func_ptr, NULL,
NULL};
+ autoload_func_info spl_alfi;
+
+ spl_alfi.func_ptr = spl_func_ptr;
+ spl_alfi.obj = NULL;
+ spl_alfi.ce = NULL;
zend_hash_add(SPL_G(autoload_functions),
spl_autoload, sizeof(spl_autoload), spl_alfi, sizeof(autoload_func_info),
NULL);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c
helly Thu Nov 3 17:04:38 2005 EDT
Modified files:
/php-src/ext/splphp_spl.c
Log:
- Add missing check flag
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.74r2=1.75ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.74 php-src/ext/spl/php_spl.c:1.75
--- php-src/ext/spl/php_spl.c:1.74 Thu Nov 3 16:58:42 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 17:04:35 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.74 2005/11/03 21:58:42 helly Exp $ */
+/* $Id: php_spl.c,v 1.75 2005/11/03 22:04:35 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -393,7 +393,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a|b,
zcallable, do_throw) == FAILURE) {
return;
}
- if (!zend_is_callable_ex(zcallable, 0, zfunc_name, alfi.ce,
alfi.func_ptr, obj_ptr TSRMLS_CC)) {
+ if (!zend_is_callable_ex(zcallable,
IS_CALLABLE_CHECK_IS_STATIC, zfunc_name, alfi.ce, alfi.func_ptr, obj_ptr
TSRMLS_CC)) {
if (do_throw) {
zend_throw_exception_ex(U_CLASS_ENTRY(spl_ce_LogicException), 0 TSRMLS_CC,
Passed array does not specify a callable static method);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl php_spl.c
helly Thu Nov 3 17:06:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/splphp_spl.c
Log:
- MFH Add missing check flag
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.13r2=1.52.2.14ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.13 php-src/ext/spl/php_spl.c:1.52.2.14
--- php-src/ext/spl/php_spl.c:1.52.2.13 Thu Nov 3 16:59:13 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 17:06:30 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.13 2005/11/03 21:59:13 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.14 2005/11/03 22:06:30 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -402,7 +402,7 @@
}
}
- if (!zend_is_callable_ex(zcallable, 0, func_name,
func_name_len, alfi.ce, alfi.func_ptr, obj_ptr TSRMLS_CC)) {
+ if (!zend_is_callable_ex(zcallable,
IS_CALLABLE_CHECK_IS_STATIC, func_name, func_name_len, alfi.ce,
alfi.func_ptr, obj_ptr TSRMLS_CC)) {
if (Z_TYPE_P(zcallable) == IS_ARRAY) {
if (!obj_ptr alfi.func_ptr
!(alfi.func_ptr-common.fn_flags ZEND_ACC_STATIC)) {
if (do_throw) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/sqlite/tests sqlite_oo_030.phpt
helly Thu Nov 3 18:48:10 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/sqlite/tests sqlite_oo_030.phpt Log: - Fix test expectations - we are no detecting the error earlier # Unfortunatley we also lower the severity here because sqlite's error # facility is dealing with the problem at this early stage as E_WARNING. http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_030.phpt?r1=1.6r2=1.6.4.1ty=u Index: php-src/ext/sqlite/tests/sqlite_oo_030.phpt diff -u php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.6 php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.6.4.1 --- php-src/ext/sqlite/tests/sqlite_oo_030.phpt:1.6 Fri Mar 26 16:16:50 2004 +++ php-src/ext/sqlite/tests/sqlite_oo_030.phpt Thu Nov 3 18:48:09 2005 @@ -39,4 +39,6 @@ string(1) 1 string(3) PHP -Fatal error: Call to undefined method foo::bar(php)() in %ssqlite_oo_030.php on line %d +Warning: SQLiteDatabase::singleQuery(): function `foo::bar(PHP)' is not a function name in %ssqlite_oo_030.php on line %d +bool(false) +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
