Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dir.c
On Mon, 16 Jul 2007, Antony Dovgal wrote: tony2001 Mon Jul 16 20:30:27 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard dir.c Log: MF52: initialize glob struct Don't you want to mention this in the NEWS file? Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard dir.c
On 17.07.2007 11:54, Derick Rethans wrote: On Mon, 16 Jul 2007, Antony Dovgal wrote: tony2001Mon Jul 16 20:30:27 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard dir.c Log: MF52: initialize glob struct Don't you want to mention this in the NEWS file? I will, as soon as we have CVE for it. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c
janiTue Jul 17 08:38:19 2007 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
- Fixed bug #42015 (ldap_rename() gets server error DSA is unwilling to
perform)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.173r2=1.174diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.173 php-src/ext/ldap/ldap.c:1.174
--- php-src/ext/ldap/ldap.c:1.173 Fri Jul 13 02:00:26 2007
+++ php-src/ext/ldap/ldap.c Tue Jul 17 08:38:19 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.173 2007/07/13 02:00:26 jani Exp $ */
+/* $Id: ldap.c,v 1.174 2007/07/17 08:38:19 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +322,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.173
2007/07/13 02:00:26 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.174
2007/07/17 08:38:19 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -2074,6 +2074,7 @@
zval **link, **dn, **newrdn, **newparent, **deleteoldrdn;
ldap_linkdata *ld;
int rc;
+ char *newp = NULL;
if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, link, dn,
newrdn, newparent, deleteoldrdn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2086,10 +2087,12 @@
convert_to_string_ex(newparent);
convert_to_boolean_ex(deleteoldrdn);
+ newp = (Z_STRLEN_PP(newparent) 0) ? Z_STRVAL_PP(newparent) : NULL;
+
#if (LDAP_API_VERSION 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10
- rc = ldap_rename_s(ld-link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn),
Z_STRVAL_PP(newparent), Z_BVAL_PP(deleteoldrdn), NULL, NULL);
+ rc = ldap_rename_s(ld-link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn),
newp, Z_BVAL_PP(deleteoldrdn), NULL, NULL);
#else
- if (Z_STRLEN_PP(newparent) != 0) {
+ if (newp != NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, You are using old
LDAP API, newparent must be the empty string, can only modify RDN);
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 /ext/ldap ldap.c
janiTue Jul 17 08:40:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/ldap ldap.c
Log:
MFH:- Fixed bug #42015 (ldap_rename() gets server error DSA is unwilling to
perform)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.835r2=1.2027.2.547.2.836diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.835 php-src/NEWS:1.2027.2.547.2.836
--- php-src/NEWS:1.2027.2.547.2.835 Fri Jul 13 14:00:04 2007
+++ php-src/NEWSTue Jul 17 08:40:24 2007
@@ -59,6 +59,8 @@
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
+- Fixed bug #42015 (ldap_rename(): server error DSA is unwilling to perform).
+ (bob at mroczka dot com, Jani)
- Fixed bug #41964 (strtotime returns a timestamp for non-time string of
pattern '(A|a) .+'). (Derick)
- Fixed bug #41961 (Ensure search for hidden private methods does not stray
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.9r2=1.161.2.3.2.10diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.9
php-src/ext/ldap/ldap.c:1.161.2.3.2.10
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.9 Fri Jul 13 10:55:43 2007
+++ php-src/ext/ldap/ldap.c Tue Jul 17 08:40:24 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.9 2007/07/13 10:55:43 jani Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.10 2007/07/17 08:40:24 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +322,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.9
2007/07/13 10:55:43 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.10 2007/07/17 08:40:24 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -2076,6 +2076,7 @@
zval **link, **dn, **newrdn, **newparent, **deleteoldrdn;
ldap_linkdata *ld;
int rc;
+ char *newp = NULL;
if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, link, dn,
newrdn, newparent, deleteoldrdn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2088,10 +2089,12 @@
convert_to_string_ex(newparent);
convert_to_boolean_ex(deleteoldrdn);
+ newp = (Z_STRLEN_PP(newparent) 0) ? Z_STRVAL_PP(newparent) : NULL;
+
#if (LDAP_API_VERSION 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10
- rc = ldap_rename_s(ld-link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn),
Z_STRVAL_PP(newparent), Z_BVAL_PP(deleteoldrdn), NULL, NULL);
+ rc = ldap_rename_s(ld-link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn),
newp, Z_BVAL_PP(deleteoldrdn), NULL, NULL);
#else
- if (Z_STRLEN_PP(newparent) != 0) {
+ if (newp != NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, You are using old
LDAP API, newparent must be the empty string, can only modify RDN);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c
janiTue Jul 17 09:09:03 2007 UTC
Modified files:
/php-src/ext/ldap ldap.c
Log:
MFB: %f - %F
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.174r2=1.175diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.174 php-src/ext/ldap/ldap.c:1.175
--- php-src/ext/ldap/ldap.c:1.174 Tue Jul 17 08:38:19 2007
+++ php-src/ext/ldap/ldap.c Tue Jul 17 09:09:03 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.174 2007/07/17 08:38:19 jani Exp $ */
+/* $Id: ldap.c,v 1.175 2007/07/17 09:09:03 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +322,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.174
2007/07/17 08:38:19 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.175
2007/07/17 09:09:03 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -347,13 +347,13 @@
#if HAVE_NSLDAP
SDKVersion = ldap_version(ver);
- snprintf(tmp, 31, %f, SDKVersion/100.0);
+ snprintf(tmp, 31, %F, SDKVersion/100.0);
php_info_print_table_row(2, SDK Version, tmp);
- snprintf(tmp, 31, %f, ver.protocol_version/100.0);
+ snprintf(tmp, 31, %F, ver.protocol_version/100.0);
php_info_print_table_row(2, Highest LDAP Protocol Supported, tmp);
- snprintf(tmp, 31, %f, ver.SSL_version/100.0);
+ snprintf(tmp, 31, %F, ver.SSL_version/100.0);
php_info_print_table_row(2, SSL Level Supported, tmp);
if (ver.security_level != LDAP_SECURITY_NONE) {
--
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/ldap ldap.c
janiTue Jul 17 09:09:43 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ldap ldap.c
Log:
MFH: removed dots from error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.10r2=1.161.2.3.2.11diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.10
php-src/ext/ldap/ldap.c:1.161.2.3.2.11
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.10 Tue Jul 17 08:40:24 2007
+++ php-src/ext/ldap/ldap.c Tue Jul 17 09:09:42 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.10 2007/07/17 08:40:24 jani Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.11 2007/07/17 09:09:42 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +322,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.10 2007/07/17 08:40:24 jani Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v
1.161.2.3.2.11 2007/07/17 09:09:42 jani Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -899,11 +899,11 @@
RETVAL_FALSE;
} else {
if (errno == LDAP_SIZELIMIT_EXCEEDED) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Partial
search results returned: Sizelimit exceeded.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Partial
search results returned: Sizelimit exceeded);
}
#ifdef LDAP_ADMINLIMIT_EXCEEDED
else if (errno == LDAP_ADMINLIMIT_EXCEEDED) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Partial
search results returned: Adminlimit exceeded.);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Partial
search results returned: Adminlimit exceeded);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Jul 17 09:32:39 2007 UTC Modified files: /CVSROOTavail Log: - peclweb karma for johannes http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1287r2=1.1288diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1287 CVSROOT/avail:1.1288 --- CVSROOT/avail:1.1287Fri Jul 13 11:23:46 2007 +++ CVSROOT/avail Tue Jul 17 09:32:39 2007 @@ -83,7 +83,7 @@ avail|noihex,mfalgas,ereza,ebi,ait,jabro,eduardcapell,oriolm,yagooar,jeprubio,marctm|phpdoc-ca # access to the pecl website etc -avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani|peclweb,pecl +avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani,johannes|peclweb,pecl # access to the newly cut pecl4win website avail|edink,derick|pecl4win -- 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/tidy php_tidy.def
nlopess Tue Jul 17 10:29:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/tidy php_tidy.def Log: update for latest library rlease http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/php_tidy.def?r1=1.2.2.1r2=1.2.2.1.2.1diff_format=u Index: php-src/ext/tidy/php_tidy.def diff -u php-src/ext/tidy/php_tidy.def:1.2.2.1 php-src/ext/tidy/php_tidy.def:1.2.2.1.2.1 --- php-src/ext/tidy/php_tidy.def:1.2.2.1 Wed Apr 19 20:57:30 2006 +++ php-src/ext/tidy/php_tidy.def Tue Jul 17 10:29:32 2007 @@ -12,8 +12,6 @@ tidyBufGetByte tidyBufEndOfInput tidyBufUngetByte -initInputBuffer -initOutputBuffer tidyCreate tidyRelease tidySetAppData -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy php_tidy.def
nlopess Tue Jul 17 10:30:51 2007 UTC Modified files: /php-src/ext/tidy php_tidy.def Log: MFB: update http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/php_tidy.def?r1=1.3r2=1.4diff_format=u Index: php-src/ext/tidy/php_tidy.def diff -u php-src/ext/tidy/php_tidy.def:1.3 php-src/ext/tidy/php_tidy.def:1.4 --- php-src/ext/tidy/php_tidy.def:1.3 Wed Apr 19 20:37:55 2006 +++ php-src/ext/tidy/php_tidy.def Tue Jul 17 10:30:50 2007 @@ -12,8 +12,6 @@ tidyBufGetByte tidyBufEndOfInput tidyBufUngetByte -initInputBuffer -initOutputBuffer tidyCreate tidyRelease tidySetAppData -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/odbc config.m4
janiTue Jul 17 12:11:41 2007 UTC Modified files: /php-src/ext/odbc config.m4 Log: - Fixed bug #42019 (configure option --with-adabas=DIR does not work) http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.81r2=1.82diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.81 php-src/ext/odbc/config.m4:1.82 --- php-src/ext/odbc/config.m4:1.81 Wed Jul 11 23:10:46 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 17 12:11:41 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.81 2007/07/11 23:10:46 jani Exp $ +dnl $Id: config.m4,v 1.82 2007/07/17 12:11:41 jani Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -119,6 +119,7 @@ PHP_ADD_LIBRARY(sqlrte) PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc) ODBC_TYPE=adabas +ODBC_INCDIR=$PHP_ADABAS/incl PHP_ODBC_CHECK_HEADER(sqlext.h) AC_DEFINE(HAVE_ADABAS,1,[ ]) AC_MSG_RESULT([$ext_output]) -- 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/odbc config.m4
janiTue Jul 17 12:12:26 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/odbc config.m4 Log: MFH:- Fixed bug #42019 (configure option --with-adabas=DIR does not work) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.836r2=1.2027.2.547.2.837diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.836 php-src/NEWS:1.2027.2.547.2.837 --- php-src/NEWS:1.2027.2.547.2.836 Tue Jul 17 08:40:24 2007 +++ php-src/NEWSTue Jul 17 12:12:26 2007 @@ -59,6 +59,7 @@ - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) +- Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani) - Fixed bug #42015 (ldap_rename(): server error DSA is unwilling to perform). (bob at mroczka dot com, Jani) - Fixed bug #41964 (strtotime returns a timestamp for non-time string of http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/config.m4?r1=1.78.2.2.2.2r2=1.78.2.2.2.3diff_format=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.78.2.2.2.2 php-src/ext/odbc/config.m4:1.78.2.2.2.3 --- php-src/ext/odbc/config.m4:1.78.2.2.2.2 Wed Jul 11 23:20:36 2007 +++ php-src/ext/odbc/config.m4 Tue Jul 17 12:12:26 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.78.2.2.2.2 2007/07/11 23:20:36 jani Exp $ +dnl $Id: config.m4,v 1.78.2.2.2.3 2007/07/17 12:12:26 jani Exp $ dnl AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ @@ -119,6 +119,7 @@ PHP_ADD_LIBRARY(sqlrte) PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc) ODBC_TYPE=adabas +ODBC_INCDIR=$PHP_ADABAS/incl PHP_ODBC_CHECK_HEADER(sqlext.h) AC_DEFINE(HAVE_ADABAS,1,[ ]) AC_MSG_RESULT([$ext_output]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams xp_socket.c
janiTue Jul 17 13:27:39 2007 UTC
Modified files:
/php-src/main/streams xp_socket.c
Log:
- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.40r2=1.41diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.40
php-src/main/streams/xp_socket.c:1.41
--- php-src/main/streams/xp_socket.c:1.40 Mon Jan 1 09:29:36 2007
+++ php-src/main/streams/xp_socket.cTue Jul 17 13:27:38 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.40 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.41 2007/07/17 13:27:38 jani Exp $ */
#include php.h
#include ext/standard/file.h
@@ -281,18 +281,11 @@
}
case PHP_STREAM_OPTION_BLOCKING:
-
oldmode = sock-is_blocked;
-
- /* no need to change anything */
- if (value == oldmode)
- return oldmode;
-
if (SUCCESS == php_set_sock_blocking(sock-socket,
value TSRMLS_CC)) {
sock-is_blocked = value;
return oldmode;
}
-
return PHP_STREAM_OPTION_RETURN_ERR;
case PHP_STREAM_OPTION_READ_TIMEOUT:
@@ -751,11 +744,8 @@
/* fall through */
;
}
-
- /* fall through */
- default:
- return php_sockop_set_option(stream, option, value,
ptrparam TSRMLS_CC);
}
+ return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC);
}
--
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 /main/streams xp_socket.c
janiTue Jul 17 13:28:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams xp_socket.c
Log:
MFH:- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.837r2=1.2027.2.547.2.838diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.837 php-src/NEWS:1.2027.2.547.2.838
--- php-src/NEWS:1.2027.2.547.2.837 Tue Jul 17 12:12:26 2007
+++ php-src/NEWSTue Jul 17 13:28:43 2007
@@ -154,6 +154,8 @@
apache child die). (isk at ecommerce dot com, Gopal, Tony)
- Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter).
(diafour at gmail dot com, Jani)
+- Fixed bugs #36796, #36918, #41371 (stream_set_blocking() does not work).
+ (Jani)
- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
(Jani)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.4r2=1.33.2.2.2.5diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.4
php-src/main/streams/xp_socket.c:1.33.2.2.2.5
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.4 Mon Jan 1 09:36:12 2007
+++ php-src/main/streams/xp_socket.cTue Jul 17 13:28:44 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.4 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.5 2007/07/17 13:28:44 jani Exp $ */
#include php.h
#include ext/standard/file.h
@@ -281,18 +281,11 @@
}
case PHP_STREAM_OPTION_BLOCKING:
-
oldmode = sock-is_blocked;
-
- /* no need to change anything */
- if (value == oldmode)
- return oldmode;
-
if (SUCCESS == php_set_sock_blocking(sock-socket,
value TSRMLS_CC)) {
sock-is_blocked = value;
return oldmode;
}
-
return PHP_STREAM_OPTION_RETURN_ERR;
case PHP_STREAM_OPTION_READ_TIMEOUT:
@@ -751,11 +744,8 @@
/* fall through */
;
}
-
- /* fall through */
- default:
- return php_sockop_set_option(stream, option, value,
ptrparam TSRMLS_CC);
}
+ return php_sockop_set_option(stream, option, value, ptrparam TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
janiTue Jul 17 13:29:25 2007 UTC
Modified files:
/php-src/main network.c
Log:
ws fix
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.125r2=1.126diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.125 php-src/main/network.c:1.126
--- php-src/main/network.c:1.125Thu Jan 11 15:51:29 2007
+++ php-src/main/network.c Tue Jul 17 13:29:25 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.125 2007/01/11 15:51:29 tony2001 Exp $ */
+/* $Id: network.c,v 1.126 2007/07/17 13:29:25 jani Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1026,32 +1026,32 @@
PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
{
- int ret = SUCCESS;
- int flags;
- int myflag = 0;
+ int ret = SUCCESS;
+ int flags;
+ int myflag = 0;
#ifdef PHP_WIN32
- /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
- flags = !block;
- if (ioctlsocket(socketd, FIONBIO, flags)==SOCKET_ERROR){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
WSAGetLastError());
- ret = FALSE;
- }
+ /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking
*/
+ flags = !block;
+ if (ioctlsocket(socketd, FIONBIO, flags) == SOCKET_ERROR) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
WSAGetLastError());
+ ret = FALSE;
+ }
#else
- flags = fcntl(socketd, F_GETFL);
+ flags = fcntl(socketd, F_GETFL);
#ifdef O_NONBLOCK
- myflag = O_NONBLOCK; /* POSIX version */
+ myflag = O_NONBLOCK; /* POSIX version */
#elif defined(O_NDELAY)
- myflag = O_NDELAY; /* old non-POSIX version */
+ myflag = O_NDELAY; /* old non-POSIX version */
#endif
- if (!block) {
- flags |= myflag;
- } else {
+ if (!block) {
+ flags |= myflag;
+ } else {
flags = ~myflag;
- }
- fcntl(socketd, F_SETFL, flags);
+ }
+ fcntl(socketd, F_SETFL, flags);
#endif
- return ret;
+ return ret;
}
PHPAPI void _php_emit_fd_setsize_warning(int max_fd)
--
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) /main network.c
janiTue Jul 17 13:29:33 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
Log:
MFH: ws fix
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.4r2=1.118.2.2.2.5diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.4
php-src/main/network.c:1.118.2.2.2.5
--- php-src/main/network.c:1.118.2.2.2.4Thu Jan 11 15:51:37 2007
+++ php-src/main/network.c Tue Jul 17 13:29:33 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.4 2007/01/11 15:51:37 tony2001 Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.5 2007/07/17 13:29:33 jani Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1026,32 +1026,32 @@
PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
{
- int ret = SUCCESS;
- int flags;
- int myflag = 0;
+ int ret = SUCCESS;
+ int flags;
+ int myflag = 0;
#ifdef PHP_WIN32
- /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */
- flags = !block;
- if (ioctlsocket(socketd, FIONBIO, flags)==SOCKET_ERROR){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
WSAGetLastError());
- ret = FALSE;
- }
+ /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking
*/
+ flags = !block;
+ if (ioctlsocket(socketd, FIONBIO, flags) == SOCKET_ERROR) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
WSAGetLastError());
+ ret = FALSE;
+ }
#else
- flags = fcntl(socketd, F_GETFL);
+ flags = fcntl(socketd, F_GETFL);
#ifdef O_NONBLOCK
- myflag = O_NONBLOCK; /* POSIX version */
+ myflag = O_NONBLOCK; /* POSIX version */
#elif defined(O_NDELAY)
- myflag = O_NDELAY; /* old non-POSIX version */
+ myflag = O_NDELAY; /* old non-POSIX version */
#endif
- if (!block) {
- flags |= myflag;
- } else {
+ if (!block) {
+ flags |= myflag;
+ } else {
flags = ~myflag;
- }
- fcntl(socketd, F_SETFL, flags);
+ }
+ fcntl(socketd, F_SETFL, flags);
#endif
- return ret;
+ return ret;
}
PHPAPI void _php_emit_fd_setsize_warning(int max_fd)
--
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) /main php_open_temporary_file.c php_open_temporary_file.h rfc1867.c
iliaa Tue Jul 17 23:46:40 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_open_temporary_file.c php_open_temporary_file.h
rfc1867.c
Log:
Allow file uploads to bypass open_basedir checks (fixes regression)
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.7r2=1.34.2.1.2.8diff_format=u
Index: php-src/main/php_open_temporary_file.c
diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.7
php-src/main/php_open_temporary_file.c:1.34.2.1.2.8
--- php-src/main/php_open_temporary_file.c:1.34.2.1.2.7 Wed Feb 7 21:07:31 2007
+++ php-src/main/php_open_temporary_file.c Tue Jul 17 23:46:40 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.7 2007/02/07 21:07:31 tony2001
Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.8 2007/07/17 23:46:40 iliaa Exp
$ */
#include php.h
@@ -211,7 +211,7 @@
* This function should do its best to return a file pointer to a newly created
* unique file, on every platform.
*/
-PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC)
+PHPAPI int php_open_temporary_fd_ex(const char *dir, const char *pfx, char
**opened_path_p, zend_bool open_basedir_check TSRMLS_DC)
{
int fd;
const char *temp_dir;
@@ -227,7 +227,7 @@
def_tmp:
temp_dir = php_get_temporary_directory();
- if (temp_dir *temp_dir != '\0'
!php_check_open_basedir(temp_dir TSRMLS_CC)) {
+ if (temp_dir *temp_dir != '\0' (!open_basedir_check ||
!php_check_open_basedir(temp_dir TSRMLS_CC))) {
return php_do_open_temporary_file(temp_dir, pfx,
opened_path_p TSRMLS_CC);
} else {
return -1;
@@ -243,6 +243,11 @@
return fd;
}
+PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC)
+{
+ return php_open_temporary_fd_ex(dir, pfx, opened_path_p, 0 TSRMLS_CC);
+}
+
PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC)
{
FILE *fp;
http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.h?r1=1.13.2.1.2.2r2=1.13.2.1.2.3diff_format=u
Index: php-src/main/php_open_temporary_file.h
diff -u php-src/main/php_open_temporary_file.h:1.13.2.1.2.2
php-src/main/php_open_temporary_file.h:1.13.2.1.2.3
--- php-src/main/php_open_temporary_file.h:1.13.2.1.2.2 Wed Feb 7 21:01:06 2007
+++ php-src/main/php_open_temporary_file.h Tue Jul 17 23:46:40 2007
@@ -16,13 +16,14 @@
+--+
*/
-/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.2 2007/02/07 21:01:06 helly Exp
$ */
+/* $Id: php_open_temporary_file.h,v 1.13.2.1.2.3 2007/07/17 23:46:40 iliaa Exp
$ */
#ifndef PHP_OPEN_TEMPORARY_FILE_H
#define PHP_OPEN_TEMPORARY_FILE_H
BEGIN_EXTERN_C()
PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC);
+PHPAPI int php_open_temporary_fd_ex(const char *dir, const char *pfx, char
**opened_path_p, zend_bool open_basedir_check TSRMLS_DC);
PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char
**opened_path_p TSRMLS_DC);
PHPAPI const char *php_get_temporary_directory(void);
PHPAPI void php_shutdown_temporary_directory();
http://cvs.php.net/viewvc.cgi/php-src/main/rfc1867.c?r1=1.173.2.1.2.8r2=1.173.2.1.2.9diff_format=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.173.2.1.2.8
php-src/main/rfc1867.c:1.173.2.1.2.9
--- php-src/main/rfc1867.c:1.173.2.1.2.8Sat Feb 24 14:53:50 2007
+++ php-src/main/rfc1867.c Tue Jul 17 23:46:40 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.173.2.1.2.8 2007/02/24 14:53:50 helly Exp $ */
+/* $Id: rfc1867.c,v 1.173.2.1.2.9 2007/07/17 23:46:40 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -1016,7 +1016,7 @@
if (!skip_upload) {
/* Handle file */
- fd = php_open_temporary_fd(PG(upload_tmp_dir),
php, temp_filename TSRMLS_CC);
+ fd =
php_open_temporary_fd_ex(PG(upload_tmp_dir), php, temp_filename, 1
TSRMLS_CC);
if (fd==-1) {
sapi_module.sapi_error(E_WARNING, File
upload error - unable to create a temporary file);
cancel_upload = UPLOAD_ERROR_E;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
