[PHP-CVS] svn: /SVNROOT/ global_avail
philip Thu, 28 Jan 2010 04:18:07 + Revision: http://svn.php.net/viewvc?view=revision&revision=294137 Log: - phpdoc/es karma for Juan Pablo Berdejo (jpberdejo) Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2010-01-28 02:17:59 UTC (rev 294136) +++ SVNROOT/global_avail2010-01-28 04:18:07 UTC (rev 294137) @@ -71,7 +71,7 @@ avail|mkoula|phpdoc/cs avail|penguin,tkxs|phpdoc/da avail|kore,thorstenr,lapistano|phpdoc/de -avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz|phpdoc/es +avail|mgonzalezle,ianasa,gustavo,soywiz,ladderalice,ideados,fcaroberga,dulasoft,benjamin,argosback,tatai,jesusruiz,jpberdejo|phpdoc/es avail|parstic|phpdoc/fa avail|magidev,mikaelkael,jpauli|phpdoc/fr avail|xdanger,jiania,haohappy|phpdoc/zh,phpdoc/hk,phpdoc/tw -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ ext/filter/tests/bug50632.phpt
johannes Thu, 28 Jan 2010 01:45:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294133
Log:
merge r293144 - Added test case for bug #50632 (iliaa)
Bug: http://bugs.php.net/50632 (Closed) Return default value if var is undefined
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
A + php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
(from
php/php-src/branches/PHP_5_3/ext/filter/tests/bug50632.phpt:r293144)
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293974
/php/php-src/trunk:284726
Copied: php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt (from rev
293144, php/php-src/branches/PHP_5_3/ext/filter/tests/bug50632.phpt)
===
--- php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3_2/ext/filter/tests/bug50632.phpt
2010-01-28 01:45:47 UTC (rev 294133)
@@ -0,0 +1,11 @@
+--TEST--
+bug 50632, filter_input() does not return default value if the variable does
not exist
+--SKIPIF--
+
+--FILE--
+
FILTER_REQUIRE_SCALAR, 'options' => array('default' => 23)));
+var_dump($foo);
+?>
+--EXPECT--
+int(23)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt branches/PHP_5_3/ext/standard/tests/file/fgetss_basic1.phpt branches/PHP_5_3/ext/standard/tests/file/fgetss_basi
pajoye Thu, 28 Jan 2010 00:37:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294129
Log:
- more EOL fixes, don't use expectf
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic1.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic2-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation1-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation3-win32.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation4.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation5-win32.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/file.inc
U php/php-src/trunk/ext/standard/tests/file/fgetss_basic1.phpt
U php/php-src/trunk/ext/standard/tests/file/fgetss_variation1-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/fgetss_variation3-win32.phpt
U php/php-src/trunk/ext/standard/tests/file/fgetss_variation4.phpt
U php/php-src/trunk/ext/standard/tests/file/fgetss_variation5-win32.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt 2010-01-28 00:14:49 UTC (rev 294128)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt 2010-01-28 00:37:20 UTC (rev 294129)
@@ -20,6 +20,7 @@
$file_handle = fopen($filename, "w");
if($file_handle == false)
exit("Error:failed to open file $filename");
+
if(substr(PHP_OS, 0, 3) == "WIN") {
$data = str_replace("\r",'', $data);
}
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic1.phpt 2010-01-28 00:14:49 UTC (rev 294128)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic1.phpt 2010-01-28 00:37:20 UTC (rev 294129)
@@ -22,7 +22,9 @@
html
EOT;
-
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string_with_tags = str_replace("\r",'', $string_with_tags);
+}
/* try reading the file opened in different modes of reading */
$file_modes = array("r","rb", "rt","r+", "r+b", "r+t");
@@ -62,7 +64,7 @@
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing fgetss() : Basic operations ***
-- Testing fgetss() with file opened using r mode --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic2-win32.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic2-win32.phpt 2010-01-28 00:14:49 UTC (rev 294128)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_basic2-win32.phpt 2010-01-28 00:37:20 UTC (rev 294129)
@@ -29,7 +29,9 @@
is a heredoc string. ksklnm@@$$&$&^%&^%&^%&
html
EOT;
-
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string_with_tags = str_replace("\r",'', $string_with_tags);
+}
$filename = dirname(__FILE__)."/fgetss_basic2.tmp";
/* try reading the file opened in different modes of reading */
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation1-win32.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation1-win32.phpt 2010-01-28 00:14:49 UTC (rev 294128)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation1-win32.phpt 2010-01-28 00:37:20 UTC (rev 294129)
@@ -36,6 +36,10 @@
this is the line with \n character.
EOT;
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string_with_tags = str_replace("\r",'', $string_with_tags);
+}
+
$filename = dirname(__FILE__)."/fgetss_variation1.tmp";
/* try reading the file opened in different modes of reading */
@@ -73,7 +77,7 @@
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing fgetss() : usage variations ***
-- Testing fgetss() with file opened using w mode --
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation3-win32.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation3-win32.phpt 2010-01-28 00:14:49 UTC (rev 294128)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fgetss_variation3-win32.phpt 2010-01-28 00:37:20 UTC (rev 294129)
@@ -35,6 +35,10 @@
this is the line with \n character.
EOT;
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $string_with_tags = str_replace("\r",'', $string_with_tags);
+}
+
$filename = dirname(__FILE__)."/fgetss_variation3.tmp";
/* try reading the file opened in different modes of reading */
@@ -76,7 +80,7 @@
echo "Done\n";
?>
---EXPECTF--
+--EXPECT--
*** Testing fgetss() : usage va
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt trunk/ext/standard/tests/file/fflush_basic.phpt
pajoye Thu, 28 Jan 2010 00:05:37 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294127
Log:
- fix possible EOL conversion on svn co on windows
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
U php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
2010-01-27 23:54:52 UTC (rev 294126)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/fflush_basic.phpt
2010-01-28 00:05:37 UTC (rev 294127)
@@ -20,6 +20,9 @@
$file_handle = fopen($filename, "w");
if($file_handle == false)
exit("Error:failed to open file $filename");
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $data = str_replace("\r",'', $data);
+}
// writing data to the file
var_dump( fwrite($file_handle, $data) );
Modified: php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt 2010-01-27
23:54:52 UTC (rev 294126)
+++ php/php-src/trunk/ext/standard/tests/file/fflush_basic.phpt 2010-01-28
00:05:37 UTC (rev 294127)
@@ -20,6 +20,9 @@
$file_handle = fopen($filename, "w");
if($file_handle == false)
exit("Error:failed to open file $filename");
+if(substr(PHP_OS, 0, 3) == "WIN") {
+ $data = str_replace("\r",'', $data);
+}
// writing data to the file
var_dump( fwrite($file_handle, $data) );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/bug47767.phpt trunk/ext/standard/tests/file/bug47767.phpt
pajoye Wed, 27 Jan 2010 23:54:52 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294126
Log:
- skip if not enough permission and add to trunk
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug47767.phpt
A php/php-src/trunk/ext/standard/tests/file/bug47767.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug47767.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug47767.phpt
2010-01-27 21:07:46 UTC (rev 294125)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug47767.phpt
2010-01-27 23:54:52 UTC (rev 294126)
@@ -10,6 +10,11 @@
if(PHP_WINDOWS_VERSION_MAJOR < 6) {
die('skip windows version 6.0+ only test');
}
+
+$ret = exec('mklink rename_variation13tmp.lnk ' . __FILE__ .' 2>&1', $out);
+if (strpos($ret, 'privilege')) {
+ die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
+}
?>
--FILE--
&1', $out);
+if (strpos($ret, 'privilege')) {
+ die('skip. SeCreateSymbolicLinkPrivilege not enable for this user.');
+}
+?>
+--FILE--
+';
+file_put_contents($filename, $content);
+$softlinkname = __DIR__ . '\\a_slink.php';
+symlink($filename, $softlinkname);
+include_once("$filename");
+include_once("$softlinkname");
+include_once("$softlinkname");
+
+echo "Testing include_once using directory symbolic link\n";
+$softdirlinkname = __DIR__ . "\\a_dir";
+symlink(__DIR__, $softdirlinkname);
+include_once("$softdirlinkname" . '\\a.php');
+
+echo "Testing include_once using junction points\n";
+$junctionname = __DIR__ . '\\a_jdir';
+exec("mklink /J $junctionname " . __DIR__);
+include_once("$junctionname" . '\\a.php');
+
+unlink($filename);
+unlink($softlinkname);
+rmdir($softdirlinkname);
+rmdir($junctionname);
+?>
+--EXPECT--
+Testing include_once using file symbolic link
+I am included
+Testing include_once using directory symbolic link
+Testing include_once using junction points
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/soap/php_http.c
johannes Wed, 27 Jan 2010 17:42:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294110
Log:
merge r293131 - Fixed bug #48590 (SoapClient does not honor max_redirects)
(srinatar)
Bug: http://bugs.php.net/48590 (Closed) SOAP Client (redirect loop)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/NEWS
U php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:36:46 UTC (rev 294109)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:42:17 UTC (rev 294110)
@@ -10,6 +10,7 @@
- Fixed bug #50632 (filter_input() does not return default value if the
variable does not exist). (Ilia)
+- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
- Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
in HTTP uploads). (Ilia)
- Fixed bug #47409 (extract() problem with array containing word "this").
Modified: php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-01-27 17:36:46 UTC
(rev 294109)
+++ php/php-src/branches/PHP_5_3_2/ext/soap/php_http.c 2010-01-27 17:42:17 UTC
(rev 294110)
@@ -207,6 +207,7 @@
int http_1_1;
int http_status;
int content_type_xml = 0;
+ long redirect_max = 20;
char *content_encoding;
char *http_msg = NULL;
zend_bool old_allow_url_fopen;
@@ -283,6 +284,14 @@
context = php_stream_context_from_zval(*tmp, 0);
}
+ if (context &&
+ php_stream_context_get_option(context, "http", "max_redirects",
&tmp) == SUCCESS) {
+ if (Z_TYPE_PP(tmp) != IS_STRING ||
!is_numeric_string(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &redirect_max, NULL, 1))
{
+ if (Z_TYPE_PP(tmp) == IS_LONG)
+ redirect_max = Z_LVAL_PP(tmp);
+ }
+ }
+
try_again:
if (phpurl == NULL || phpurl->host == NULL) {
if (phpurl != NULL) {php_url_free(phpurl);}
@@ -1012,6 +1021,12 @@
}
phpurl = new_url;
+ if (--redirect_max < 1) {
+ smart_str_free(&soap_headers_z);
+ add_soap_fault(this_ptr, "HTTP",
"Redirection limit reached, aborting", NULL, NULL TSRMLS_CC);
+ return FALSE;
+ }
+
goto try_again;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/imap/php_imap.c
johannes Wed, 27 Jan 2010 17:36:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294109
Log:
merge r293126 - [doc] add support for DISABLE_AUTHENTICATOR in imap_open (fix
#33500) (pajoye)
Bug: http://bugs.php.net/33500 (Closed) imap_open() fails when the server
advertises GSSAPI
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/NEWS
U php/php-src/branches/PHP_5_3_2/ext/imap/php_imap.c
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:29:38 UTC (rev 294108)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:36:46 UTC (rev 294109)
@@ -3,6 +3,7 @@
?? ??? 20??, PHP 5.3.2 RC 2
- Upgraded bundled libmagic to version 5.03. (Mikko)
+- Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
(Ilia)
- Added stream_resolve_include_path(). (Mikko)
Modified: php/php-src/branches/PHP_5_3_2/ext/imap/php_imap.c
===
--- php/php-src/branches/PHP_5_3_2/ext/imap/php_imap.c 2010-01-27 17:29:38 UTC
(rev 294108)
+++ php/php-src/branches/PHP_5_3_2/ext/imap/php_imap.c 2010-01-27 17:36:46 UTC
(rev 294109)
@@ -105,6 +105,7 @@
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, options)
ZEND_ARG_INFO(0, n_retries)
+ ZEND_ARG_INFO(0, params)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_reopen, 0, 0, 2)
@@ -1148,10 +1149,11 @@
long retries = 0, flags = NIL, cl_flags = NIL;
MAILSTREAM *imap_stream;
pils *imap_le_struct;
+ zval *params = NULL;
int argc = ZEND_NUM_ARGS();
- if (zend_parse_parameters(argc TSRMLS_CC, "sss|ll", &mailbox,
&mailbox_len, &user, &user_len,
- &passwd, &passwd_len, &flags, &retries) == FAILURE) {
+ if (zend_parse_parameters(argc TSRMLS_CC, "sss|lla", &mailbox,
&mailbox_len, &user, &user_len,
+ &passwd, &passwd_len, &flags, &retries, ¶ms) == FAILURE) {
return;
}
@@ -1165,6 +1167,46 @@
}
}
+ if (params) {
+ zval **disabled_auth_method;
+
+ if (zend_hash_find(HASH_OF(params), "DISABLE_AUTHENTICATOR",
sizeof("DISABLE_AUTHENTICATOR"), (void **)&disabled_auth_method) == SUCCESS) {
+ switch (Z_TYPE_PP(disabled_auth_method)) {
+ case IS_STRING:
+ if (Z_STRLEN_PP(disabled_auth_method) >
1) {
+ mail_parameters (NIL,
DISABLE_AUTHENTICATOR, (void *)Z_STRVAL_PP(disabled_auth_method));
+ }
+ break;
+ case IS_ARRAY:
+ {
+ zval **z_auth_method;
+ int i;
+ int nelems =
zend_hash_num_elements(Z_ARRVAL_PP(disabled_auth_method));
+
+ if (nelems == 0 ) {
+ break;
+ }
+ for (i = 0; i < nelems; i++) {
+ if
(zend_hash_index_find(Z_ARRVAL_PP(disabled_auth_method), i, (void **)
&z_auth_method) == SUCCESS) {
+ if
(Z_TYPE_PP(z_auth_method) == IS_STRING) {
+ if
(Z_STRLEN_PP(z_auth_method) > 1) {
+
mail_parameters (NIL, DISABLE_AUTHENTICATOR, (void
*)Z_STRVAL_PP(disabled_auth_method));
+ }
+ } else {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument, expect string or
array of stri
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ sapi/cli/php.1.in
johannes Wed, 27 Jan 2010 17:24:34 + Revision: http://svn.php.net/viewvc?view=revision&revision=294107 Log: merge r293075: Update copyright year in the man file (iliaa) Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/sapi/cli/php.1.in Property changes on: php/php-src/branches/PHP_5_3_2 ___ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293974 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293075,293974 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/sapi/cli/php.1.in === --- php/php-src/branches/PHP_5_3_2/sapi/cli/php.1.in2010-01-27 17:22:54 UTC (rev 294106) +++ php/php-src/branches/PHP_5_3_2/sapi/cli/php.1.in2010-01-27 17:24:34 UTC (rev 294107) @@ -1,4 +1,4 @@ -.TH PHP 1 "2009" "The PHP Group" "Scripting Language" +.TH PHP 1 "2010" "The PHP Group" "Scripting Language" .SH NAME .TP 15 php \- PHP Command Line Interface 'CLI' @@ -398,7 +398,7 @@ .SH VERSION INFORMATION This manpage describes \fBphp\fP, version @php_vers...@. .SH COPYRIGHT -Copyright \(co 1997\-2009 The PHP Group +Copyright \(co 1997\-2010 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] svn: /php/php-src/branches/PHP_5_3_2/ NEWS ext/filter/filter.c
johannes Wed, 27 Jan 2010 17:22:54 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294106
Log:
merge r293051: Fixed bug #50632 (filter_input() does not return default value if
the variable does not exist) (iliaa)
Bug: http://bugs.php.net/50632 (Closed) Return default value if var is undefined
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/NEWS
U php/php-src/branches/PHP_5_3_2/ext/filter/filter.c
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293974
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292719,292762,292765,292771,292777,292823,293051,293974
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/NEWS
===
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:07:46 UTC (rev 294105)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-27 17:22:54 UTC (rev 294106)
@@ -7,6 +7,8 @@
(Ilia)
- Added stream_resolve_include_path(). (Mikko)
+- Fixed bug #50632 (filter_input() does not return default value if the
+ variable does not exist). (Ilia)
- Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
in HTTP uploads). (Ilia)
- Fixed bug #47409 (extract() problem with array containing word "this").
Modified: php/php-src/branches/PHP_5_3_2/ext/filter/filter.c
===
--- php/php-src/branches/PHP_5_3_2/ext/filter/filter.c 2010-01-27 17:07:46 UTC
(rev 294105)
+++ php/php-src/branches/PHP_5_3_2/ext/filter/filter.c 2010-01-27 17:22:54 UTC
(rev 294106)
@@ -768,7 +768,8 @@
filter_flags = Z_LVAL_PP(filter_args);
} else if (Z_TYPE_PP(filter_args) == IS_ARRAY &&
zend_hash_find(HASH_OF(*filter_args), "flags", sizeof("flags"), (void
**)&option) == SUCCESS) {
PHP_FILTER_GET_LONG_OPT(option, filter_flags);
- } else if (Z_TYPE_PP(filter_args) == IS_ARRAY &&
+ }
+ if (Z_TYPE_PP(filter_args) == IS_ARRAY &&
zend_hash_find(HASH_OF(*filter_args),
"options", sizeof("options"), (void **)&opt) == SUCCESS &&
Z_TYPE_PP(opt) == IS_ARRAY &&
zend_hash_find(HASH_OF(*opt), "default",
sizeof("default"), (void **)&def) == SUCCESS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Wed, 27 Jan 2010 16:52:36 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294104
Log:
- fix leak
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2010-01-27 16:48:41 UTC
(rev 294103)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2010-01-27 16:52:36 UTC
(rev 294104)
@@ -170,13 +170,13 @@
/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
pResultSid = malloc(sid_len);
-
if (!pResultSid) {
goto Finished;
}
if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
goto Finished;
}
+ HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
return pResultSid;
Finished:
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2010-01-27 16:48:41 UTC (rev 294103)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2010-01-27 16:52:36 UTC (rev 294104)
@@ -176,6 +176,7 @@
if (!CopySid(sid_len, pResultSid, pTokenUser->User.Sid)) {
goto Finished;
}
+ HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
return pResultSid;
Finished:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Wed, 27 Jan 2010 16:46:43 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294102
Log:
- don't go through the reparse code when we have a share or DFS path (should
fix #50542)
Bug: http://bugs.php.net/50542 (Feedback) scandir() cannot open UNC paths since
PHP 5.3.1
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27
16:44:48 UTC (rev 294101)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27
16:46:43 UTC (rev 294102)
@@ -714,7 +714,9 @@
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
- if(save && (data.dwFileAttributes &
FILE_ATTRIBUTE_REPARSE_POINT)) {
+ if(save &&
+ !(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
+ (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:44:48 UTC (rev
294101)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:46:43 UTC (rev
294102)
@@ -714,7 +714,9 @@
tmp = tsrm_do_alloca(len+1, use_heap);
memcpy(tmp, path, len+1);
- if(save && (data.dwFileAttributes &
FILE_ATTRIBUTE_REPARSE_POINT)) {
+ if(save &&
+ !(IS_UNC_PATH(path, len) && len >= 3 && path[2] != '?') &&
+ (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
/* File is a reparse point. Get the target */
HANDLE hLink = NULL;
REPARSE_DATA_BUFFER * pbuffer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Wed, 27 Jan 2010 16:44:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=294101 Log: - little comment to avoid undesired changes in this section Changed paths: U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c === --- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27 16:43:16 UTC (rev 294100) +++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27 16:44:48 UTC (rev 294101) @@ -1514,6 +1514,7 @@ /* rename on windows will fail if newname already exists. MoveFileEx has to be used */ #ifdef TSRM_WIN32 + /* MoveFileEx returns 0 on failure, other way 'round for this function */ retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1 : 0; #else retval = rename(oldname, newname); Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c === --- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:43:16 UTC (rev 294100) +++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:44:48 UTC (rev 294101) @@ -1514,6 +1514,7 @@ /* rename on windows will fail if newname already exists. MoveFileEx has to be used */ #ifdef TSRM_WIN32 + /* MoveFileEx returns 0 on failure, other way 'round for this function */ retval = (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED) == 0) ? -1 : 0; #else retval = rename(oldname, newname); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Wed, 27 Jan 2010 16:43:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294100
Log:
- fix leak, win only
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27
16:14:53 UTC (rev 294099)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c2010-01-27
16:43:16 UTC (rev 294100)
@@ -432,8 +432,8 @@
static inline unsigned long realpath_cache_key(const char *path, int path_len
TSRMLS_DC) /* {{{ */
{
register unsigned long h;
- char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
- char *bucket_key_start = (char *)bucket_key;
+ char *bucket_key_start = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key = (char *)bucket_key_start;
const char *e = bucket_key + strlen(bucket_key);
if (!bucket_key) {
@@ -444,11 +444,7 @@
h *= 16777619;
h ^= *bucket_key++;
}
- /* if no SID were present the path is returned. Otherwise a Heap
- allocated string is returned. */
- if (bucket_key_start != path) {
- LocalFree(bucket_key_start);
- }
+ HeapFree(GetProcessHeap(), 0, (LPVOID)bucket_key_start);
return h;
}
/* }}} */
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:14:53 UTC (rev
294099)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2010-01-27 16:43:16 UTC (rev
294100)
@@ -432,8 +432,8 @@
static inline unsigned long realpath_cache_key(const char *path, int path_len
TSRMLS_DC) /* {{{ */
{
register unsigned long h;
- char *bucket_key = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
- char *bucket_key_start = (char *)bucket_key;
+ char *bucket_key_start = tsrm_win32_get_path_sid_key(path TSRMLS_CC);
+ char *bucket_key = (char *)bucket_key_start;
const char *e = bucket_key + strlen(bucket_key);
if (!bucket_key) {
@@ -444,11 +444,7 @@
h *= 16777619;
h ^= *bucket_key++;
}
- /* if no SID were present the path is returned. Otherwise a Heap
- allocated string is returned. */
- if (bucket_key_start != path) {
- LocalFree(bucket_key_start);
- }
+ HeapFree(GetProcessHeap(), 0, (LPVOID)bucket_key_start);
return h;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
On Wed, Jan 27, 2010 at 5:14 PM, Jani Taskinen wrote: > jani Wed, 27 Jan 2010 16:14:53 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=294099 > > Log: > - Short is enough, people will not understand it anyway. And this is not a > TODO, this is what was already done.. This text is simply wrong. Users may not be as stupid as you suppose :) > Changed paths: > U php/php-src/branches/PHP_5_3/NEWS > > Modified: php/php-src/branches/PHP_5_3/NEWS > === > --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 15:38:35 UTC (rev 294098) > +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 16:14:53 UTC (rev 294099) > @@ -19,8 +19,7 @@ > (Pierre) > - Fixed possible bad behavior of rename on windows when used with symbolic > links or invalid paths. (Pierre) > -- Remove output buffering for error messages sent through stderr on > - Windows. (Pierre) > +- Fixed error output to stderr on Windows. (Pierre) > > - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation). > (Ilia, hanno at hboeck dot de) > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
jani Wed, 27 Jan 2010 16:14:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=294099 Log: - Short is enough, people will not understand it anyway. And this is not a TODO, this is what was already done.. Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 15:38:35 UTC (rev 294098) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 16:14:53 UTC (rev 294099) @@ -19,8 +19,7 @@ (Pierre) - Fixed possible bad behavior of rename on windows when used with symbolic links or invalid paths. (Pierre) -- Remove output buffering for error messages sent through stderr on - Windows. (Pierre) +- Fixed error output to stderr on Windows. (Pierre) - Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation). (Ilia, hanno at hboeck dot de) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_main.c
tony2001 Wed, 27 Jan 2010 14:42:57 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294096
Log:
fix slowlog
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c
===
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c2010-01-27
14:42:49 UTC (rev 294095)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_main.c2010-01-27
14:42:57 UTC (rev 294096)
@@ -1846,8 +1846,6 @@
}
request_body_fd = -2;
- STR_FREE(SG(request_info).path_translated);
-
if (EG(exit_status) == 255) {
if (CGIG(error_header) && *CGIG(error_header)) {
sapi_header_line ctr = {0};
@@ -1869,6 +1867,9 @@
SG(request_info).query_string = NULL;
}
+ STR_FREE(SG(request_info).path_translated);
+ SG(request_info).path_translated = NULL;
+
requests++;
if (max_requests && (requests == max_requests)) {
fcgi_finish_request(&request, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Wed, 27 Jan 2010 14:41:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294094
Log:
- fix leak when the SID is already used and duplicated
Changed paths:
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2010-01-27 14:38:35 UTC
(rev 294093)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2010-01-27 14:41:06 UTC
(rev 294094)
@@ -170,6 +170,7 @@
/* ConvertSidToStringSid(pTokenUser->User.Sid, &ptcSidOwner); */
pResultSid = malloc(sid_len);
+
if (!pResultSid) {
goto Finished;
}
@@ -271,6 +272,9 @@
if (!DuplicateToken(thread_token,
SecurityImpersonation, &TWG(impersonation_token))) {
goto Finished;
}
+ } else {
+ /* we already have it, free it then */
+ free(token_sid);
}
if (CWDG(realpath_cache_size_limit)) {
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2010-01-27 14:38:35 UTC (rev 294093)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2010-01-27 14:41:06 UTC (rev 294094)
@@ -271,6 +271,9 @@
if (!DuplicateToken(thread_token,
SecurityImpersonation, &TWG(impersonation_token))) {
goto Finished;
}
+ } else {
+ /* we already have it, free it then */
+ free(token_sid);
}
if (CWDG(realpath_cache_size_limit)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/ fpm_worker_pool.c
tony2001 Wed, 27 Jan 2010 13:04:10 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294090
Log:
fix invalid read and possible crash
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
===
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
2010-01-27 12:55:01 UTC (rev 294089)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/fpm/fpm_worker_pool.c
2010-01-27 13:04:10 UTC (rev 294090)
@@ -29,13 +29,13 @@
fpm_array_free(&wp->slots_used);
fpm_array_free(&wp->slots_free);
fpm_shm_free_list(wp->shm_list, which == FPM_CLEANUP_CHILD ?
fpm_shm_slots_mem() : 0);
+ if (wp->shm_status && which != FPM_CLEANUP_CHILD) {
+ fpm_shm_free(wp->shm_status, !fpm_globals.is_child);
+ }
free(wp->config);
free(wp->user);
free(wp->home);
free(wp);
- if (wp->shm_status && which != FPM_CLEANUP_CHILD) {
- fpm_shm_free(wp->shm_status, !fpm_globals.is_child);
- }
}
fpm_worker_all_pools = 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/openssl/openssl.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
iliaaWed, 27 Jan 2010 12:55:01 +
Revision: http://svn.php.net/viewvc?view=revision&revision=294089
Log:
Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation)
Bug: http://bugs.php.net/50859 (Open) openssl-1.0.0_beta5 deprecates md2
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
U php/php-src/trunk/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-01-27 12:36:22 UTC (rev 294088)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-01-27 12:55:01 UTC (rev 294089)
@@ -18,6 +18,8 @@
gdImageFilledPolygon (libgd #100). (Takeshi Abe)
- Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
+ (Ilia, hanno at hboeck dot de)
- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
authentication). (Jani)
- Fixed bug #50823 (ReflectionFunction::isDeprecated producing "cannot be
called
Modified: php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_2/ext/openssl/openssl.c 2010-01-27 12:36:22 UTC
(rev 294088)
+++ php/php-src/branches/PHP_5_2/ext/openssl/openssl.c 2010-01-27 12:55:01 UTC
(rev 294089)
@@ -59,7 +59,9 @@
#define OPENSSL_ALGO_SHA1 1
#define OPENSSL_ALGO_MD5 2
#define OPENSSL_ALGO_MD4 3
+#ifdef HAVE_OPENSSL_MD2_H
#define OPENSSL_ALGO_MD2 4
+#endif
#define OPENSSL_ALGO_DSS1 5
#define DEBUG_SMIME0
@@ -649,9 +651,11 @@
case OPENSSL_ALGO_MD4:
mdtype = (EVP_MD *) EVP_md4();
break;
+#ifdef HAVE_OPENSSL_MD2_H
case OPENSSL_ALGO_MD2:
mdtype = (EVP_MD *) EVP_md2();
break;
+#endif
case OPENSSL_ALGO_DSS1:
mdtype = (EVP_MD *) EVP_dss1();
break;
@@ -705,7 +709,9 @@
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4,
CONST_CS|CONST_PERSISTENT);
+#ifdef HAVE_OPENSSL_MD2_H
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2,
CONST_CS|CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS1,
CONST_CS|CONST_PERSISTENT);
/* flags for S/MIME */
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 12:36:22 UTC (rev 294088)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 12:55:01 UTC (rev 294089)
@@ -22,6 +22,8 @@
- Remove output buffering for error messages sent through stderr on
Windows. (Pierre)
+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
+ (Ilia, hanno at hboeck dot de)
- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
(Ilia)
- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2010-01-27 12:36:22 UTC
(rev 294088)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c 2010-01-27 12:55:01 UTC
(rev 294089)
@@ -61,7 +61,9 @@
#define OPENSSL_ALGO_SHA1 1
#define OPENSSL_ALGO_MD5 2
#define OPENSSL_ALGO_MD4 3
+#ifdef HAVE_OPENSSL_MD2_H
#define OPENSSL_ALGO_MD2 4
+#endif
#define OPENSSL_ALGO_DSS1 5
#define DEBUG_SMIME0
@@ -917,9 +919,11 @@
case OPENSSL_ALGO_MD4:
mdtype = (EVP_MD *) EVP_md4();
break;
+#ifdef HAVE_OPENSSL_MD2_H
case OPENSSL_ALGO_MD2:
mdtype = (EVP_MD *) EVP_md2();
break;
+#endif
case OPENSSL_ALGO_DSS1:
mdtype = (EVP_MD *) EVP_dss1();
break;
@@ -1001,7 +1005,9 @@
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_SHA1", OPENSSL_ALGO_SHA1,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD5", OPENSSL_ALGO_MD5,
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD4", OPENSSL_ALGO_MD4,
CONST_CS|CONST_PERSISTENT);
+#ifdef HAVE_OPENSSL_MD2_H
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_MD2", OPENSSL_ALGO_MD2,
CONST_CS|CONST_PERSISTENT);
+#endif
REGISTER_LONG_CONSTANT("OPENSSL_ALGO_DSS1", OPENSSL_ALGO_DSS
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/rename_variation11-win32.phpt branches/PHP_5_3/ext/standard/tests/file/rename_variation12-win32.phpt branches/PHP_5_3/ext/standard
pajoye Wed, 27 Jan 2010 11:23:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=294081 Log: - update/fix/skip/add for rename tests Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation11-win32.phpt A php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation12-win32.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation12.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation3-win32.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation6-win32.phpt A php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation8-win32.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation8.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation9.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation11-win32.phpt A php/php-src/trunk/ext/standard/tests/file/rename_variation12-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation12.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation13.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation3-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation6-win32.phpt A php/php-src/trunk/ext/standard/tests/file/rename_variation8-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation8.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation9.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation11-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation11-win32.phpt 2010-01-27 10:39:23 UTC (rev 294080) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation11-win32.phpt 2010-01-27 11:23:43 UTC (rev 294081) @@ -92,12 +92,12 @@ -- Iteration 5 -- -Warning: rename(%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\renameMe.tmp,%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\IwasRenamed.tmp): No such file or directory in %s on line %d +Warning: rename(%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\renameMe.tmp,%s\renameVar11\renameVar11Sub\..\\\renameVar11Sub\\..\\..\renameVar11Sub\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d bool(false) -- Iteration 6 -- -Warning: rename(%s\renameVar11\renameVar11Sub\BADDIR\renameMe.tmp,%s\renameVar11\renameVar11Sub\BADDIR\IwasRenamed.tmp): No such file or directory in %s on line %d +Warning: rename(%s\renameVar11\renameVar11Sub\BADDIR\renameMe.tmp,%s\renameVar11\renameVar11Sub\BADDIR\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d bool(false) -- Iteration 7 -- @@ -118,7 +118,7 @@ -- Iteration 11 -- -Warning: rename(BADDIR\renameMe.tmp,BADDIR\IwasRenamed.tmp): No such file or directory in %s on line %d +Warning: rename(BADDIR\renameMe.tmp,BADDIR\IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d bool(false) -- Iteration 12 -- Added: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation12-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation12-win32.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation12-win32.phpt 2010-01-27 11:23:43 UTC (rev 294081) @@ -0,0 +1,121 @@ +--TEST-- +Test rename() function : variation - various relative, absolute paths +--CREDITS-- +Dave Kelsey +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +*** Testing rename() with absolute and relative paths *** + +-- Iteration 1 -- +bool(true) +bool(true) + +-- Iteration 2 -- +bool(true) +bool(true) + +-- Iteration 3 -- +bool(true) +bool(true) + +-- Iteration 4 -- +bool(true) +bool(true) + +-- Iteration 5 -- + +Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +bool(false) + +-- Iteration 6 -- + +Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified. (code: 3) in %s on line %d +bool(false) + +-- Iteration 7 -- +bool(true) +bool(true) + +-- Iteration 8 -- +bool(true) +bool(true) + +-- Iteration 9 -- +bool(true) +bool(true) + +-- Iteration 10 -- +bool(true) +bool(true) + +-- Iteration 11 -- + +Warning: rename(BADDIR/renameMe.tmp,BADDIR/IwasRenamed.tmp): The system cannot
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
hi, New version should be more clear :) Thx for the headup! On Wed, Jan 27, 2010 at 11:16 AM, Jani Taskinen wrote: > On 01/27/2010 10:14 AM, Pierre Joye wrote: >> >> pajoye Wed, 27 Jan 2010 08:14:50 + >> >> Revision: http://svn.php.net/viewvc?view=revision&revision=294076 >> >> Log: >> - update >> >> Changed paths: >> U php/php-src/branches/PHP_5_3/NEWS >> >> Modified: php/php-src/branches/PHP_5_3/NEWS >> === >> --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 07:48:31 UTC (rev >> 294075) >> +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 08:14:50 UTC (rev >> 294076) >> @@ -17,6 +17,10 @@ >> >> - Fixed possible crash when a error/warning is raised during php startup. >> (Pierre) >> +- Fixed possible bad behavior of rename on windows when used with >> symbolic >> + links or invalid paths. (Pierre) >> +- Fixed stderr output of errors messages on windows, it is now print out >> + synchronously as on most unix platforms. (Pierre) > > Fail? Try again please. That last entry doesn't make much sense. Grammar > fail. :) > > --Jani > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
pajoye Wed, 27 Jan 2010 10:39:23 + Revision: http://svn.php.net/viewvc?view=revision&revision=294080 Log: - attempt to be more clear Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 10:36:03 UTC (rev 294079) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 10:39:23 UTC (rev 294080) @@ -19,8 +19,8 @@ (Pierre) - Fixed possible bad behavior of rename on windows when used with symbolic links or invalid paths. (Pierre) -- Fixed stderr output of errors messages on windows, it is now print out - synchronously as on most unix platforms. (Pierre) +- Remove output buffering for error messages sent through stderr on + Windows. (Pierre) - Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/main/ php.h
pajoye Wed, 27 Jan 2010 10:36:03 + Revision: http://svn.php.net/viewvc?view=revision&revision=294079 Log: - #50854, fix build on non windows, svn merge is useless. Bug: http://bugs.php.net/50854 (Closed) DWORD and TSRMLS_DC undefined in php.h Changed paths: U php/php-src/trunk/main/php.h Modified: php/php-src/trunk/main/php.h === --- php/php-src/trunk/main/php.h2010-01-27 10:08:43 UTC (rev 294078) +++ php/php-src/trunk/main/php.h2010-01-27 10:36:03 UTC (rev 294079) @@ -305,8 +305,9 @@ /* PHPAPI void php_error(int type, const char *format, ...); */ PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...); PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...); + +PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...); #ifdef PHP_WIN32 -PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...); PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); #endif END_EXTERN_C() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
On 01/27/2010 10:14 AM, Pierre Joye wrote: pajoye Wed, 27 Jan 2010 08:14:50 + Revision: http://svn.php.net/viewvc?view=revision&revision=294076 Log: - update Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 07:48:31 UTC (rev 294075) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 08:14:50 UTC (rev 294076) @@ -17,6 +17,10 @@ - Fixed possible crash when a error/warning is raised during php startup. (Pierre) +- Fixed possible bad behavior of rename on windows when used with symbolic + links or invalid paths. (Pierre) +- Fixed stderr output of errors messages on windows, it is now print out + synchronously as on most unix platforms. (Pierre) Fail? Try again please. That last entry doesn't make much sense. Grammar fail. :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/php.h trunk/main/php.h
On 01/27/2010 09:48 AM, Pierre Joye wrote: pajoye Wed, 27 Jan 2010 07:48:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=294075 Log: - #50854, fix build on non windows Bug: http://bugs.php.net/50854 (Open) DWORD and TSRMLS_DC undefined in php.h Changed paths: U php/php-src/branches/PHP_5_3/main/php.h U php/php-src/trunk/main/php.h Modified: php/php-src/branches/PHP_5_3/main/php.h === --- php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 05:00:04 UTC (rev 294074) +++ php/php-src/branches/PHP_5_3/main/php.h 2010-01-27 07:48:31 UTC (rev 294075) @@ -309,8 +309,9 @@ PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5); PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6); +#ifdef PHP_WIN32 PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); - +#endif END_EXTERN_C() #define php_error_docref php_error_docref0 Modified: php/php-src/trunk/main/php.h === --- php/php-src/trunk/main/php.h2010-01-27 05:00:04 UTC (rev 294074) +++ php/php-src/trunk/main/php.h2010-01-27 07:48:31 UTC (rev 294075) @@ -305,8 +305,10 @@ /* PHPAPI void php_error(int type, const char *format, ...); */ PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...); PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...); +#ifdef PHP_WIN32 PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, conshp_error_docref2t char *param1, const char *param2, int type, const char *format, ...); PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); +#endif END_EXTERN_C() Are you really sure? I didn't know php_error_docref2() was also win32 only? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/rename_variation-win32.phpt trunk/ext/standard/tests/file/rename_variation-win32.phpt
pajoye Wed, 27 Jan 2010 10:08:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=294078 Log: - fix and update test according to recent fixes Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation-win32.phpt 2010-01-27 09:47:17 UTC (rev 294077) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation-win32.phpt 2010-01-27 10:08:43 UTC (rev 294078) @@ -69,7 +69,7 @@ bool(true) -- Iteration 2 -- -Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): No such file or directory in %s on line %d +Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) bool(false) bool(false) Modified: php/php-src/trunk/ext/standard/tests/file/rename_variation-win32.phpt === --- php/php-src/trunk/ext/standard/tests/file/rename_variation-win32.phpt 2010-01-27 09:47:17 UTC (rev 294077) +++ php/php-src/trunk/ext/standard/tests/file/rename_variation-win32.phpt 2010-01-27 10:08:43 UTC (rev 294078) @@ -69,7 +69,7 @@ bool(true) -- Iteration 2 -- -Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): No such file or directory in %s on line %d +Warning: rename(%s/rename_variation/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt trunk/ext/standard/tests/file/rename_variation13-win32.phpt
pajoye Wed, 27 Jan 2010 09:47:17 + Revision: http://svn.php.net/viewvc?view=revision&revision=294077 Log: - fix and update test according to recent fixes Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt U php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-01-27 08:14:50 UTC (rev 294076) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/rename_variation13-win32.phpt 2010-01-27 09:47:17 UTC (rev 294077) @@ -14,23 +14,14 @@ * Source code: ext/standard/file.c * Alias to functions: */ - - -echo "*** Testing rename() with obscure files ***\n"; -$file_path = dirname(__FILE__)."/renameVar13"; -$aFile = $file_path.'/afile.tmp'; - -mkdir($file_path); - /* An array of files */ $names_arr = array( /* Invalid args */ - -1, - TRUE, + -1, /* -1 is just a valid filename on windows */ + TRUE, /* 1 as well, (string)TRUE > "1" */ FALSE, NULL, - // I think both p8 and php are wrong on the messages here - "", + "", // I think both p8 and php are wrong on the messages here //p8 generates different messages to php, php is probably wrong //php has either "File Exists" or "Permission Denied". " ", @@ -45,14 +36,24 @@ ); -for( $i=0; $i --EXPECTF-- *** Testing rename() with obscure files *** --- testing '-1' -- +-- 0 testing '-1' integer -- bool(true) -Warning: rename(-1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(-1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d bool(false) --- testing '1' -- +-- 1 testing '1' boolean -- bool(true) -Warning: rename(1,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(1,%s/renameVar13/afile.tmp): The system cannot find the file specified. (code: 2) in %s on line %d bool(false) --- testing '' -- +-- 2 testing '' boolean -- -Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d +Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) --- testing '' -- +-- 3 testing '' NULL -- -Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d +Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) --- testing '' -- +-- 4 testing '' string -- -Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d +Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) --- testing ' ' -- +-- 5 testing ' ' string -- -Warning: rename(%s/renameVar13/afile.tmp, ): No such file or directory in %s on line %d +Warning: rename(%s/renameVar13/afile.tmp, ): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) -Warning: rename( ,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename( ,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) --- testing ' ' -- +-- 6 testing ' ' string -- -Warning: rename(%s/renameVar13/afile.tmp,): No such file or directory in %s on line %d +Warning: rename(%s/renameVar13/afile.tmp,): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) -Warning: rename(,%s/renameVar13/afile.tmp): No such file or directory in %s on line %d +Warning: rename(,%s/renameVar13/afile.tmp): The filename, directory name, or volume label syntax is incorrect. (code: 123) in %s on line %d bool(false) --- testing 'Array' -- +-- 7 testing 'Array' array -- Warning: rename() expects parameter 2 to be string, array given in %s on line %d bool(false) @@ -121,19 +122,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
pajoye Wed, 27 Jan 2010 08:14:50 + Revision: http://svn.php.net/viewvc?view=revision&revision=294076 Log: - update Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-01-27 07:48:31 UTC (rev 294075) +++ php/php-src/branches/PHP_5_3/NEWS 2010-01-27 08:14:50 UTC (rev 294076) @@ -17,6 +17,10 @@ - Fixed possible crash when a error/warning is raised during php startup. (Pierre) +- Fixed possible bad behavior of rename on windows when used with symbolic + links or invalid paths. (Pierre) +- Fixed stderr output of errors messages on windows, it is now print out + synchronously as on most unix platforms. (Pierre) - Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
