[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/date/lib/ parse_date.c parse_date.re
nlopess Mon, 28 Mar 2011 09:10:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309775 Log: fix last commit: - fix code coverage build - spread static love Changed paths: U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re diffs exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/date/lib/ parse_date.c parse_date.re
nlopess Mon, 28 Mar 2011 09:11:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309776 Log: MFB (r309775): fix last commit Changed paths: U php/php-src/trunk/ext/date/lib/parse_date.c U php/php-src/trunk/ext/date/lib/parse_date.re diffs exceeded maximum size -- 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/ext/date/lib/ parse_date.c parse_date.re
On Mon, 28 Mar 2011, Nuno Lopes wrote: nlopess Mon, 28 Mar 2011 09:10:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309775 Log: fix last commit: - fix code coverage build - spread static love Changed paths: U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re Why is that .c file change so large? Did you use the little line in the ext/date/lib/README for re-generating the file? cheers, Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/date/lib/ parse_date.c parse_date.re
On Mon, 28 Mar 2011, Nuno Lopes wrote: nlopess Mon, 28 Mar 2011 09:11:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309776 Log: MFB (r309775): fix last commit It doesn't fix anything, it's just a MFB... and you changed the .c file in the same (incorrect) way. cheers, Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- 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/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Mon, 28 Mar 2011 10:55:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309779
Log:
- re enable static analyzer, crash fixed with snapshot builds
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-28 10:53:13 UTC
(rev 309778)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-28 10:55:34 UTC
(rev 309779)
@@ -414,7 +414,7 @@
}
ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
-if (PHP_STATIC_ANALYZE == yes PHP_SNAPSHOT_BUILD == no) {
+if (PHP_STATIC_ANALYZE == yes) {
ADD_FLAG(CFLAGS, /analyze );
ADD_FLAG(CFLAGS, /wd6308 );
}
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-03-28 10:53:13 UTC (rev
309778)
+++ php/php-src/trunk/win32/build/config.w322011-03-28 10:55:34 UTC (rev
309779)
@@ -414,7 +414,7 @@
}
ARG_ENABLE(static-analyze, Enable the VC compiler static analyze, no);
-if (PHP_STATIC_ANALYZE == yes PHP_SNAPSHOT_BUILD == no) {
+if (PHP_STATIC_ANALYZE == yes) {
ADD_FLAG(CFLAGS, /analyze );
ADD_FLAG(CFLAGS, /wd6308 );
}
--
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 branches/PHP_5_3/main/php_open_temporary_file.c trunk/main/php_open_temporary_file.c
pajoye Mon, 28 Mar 2011 16:43:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309792
Log:
- Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent, windows fix
Bug: http://bugs.php.net/48465 (Assigned) sys_get_temp_dir() possibly
inconsistent when using TMPDIR
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/php_open_temporary_file.c
U php/php-src/trunk/main/php_open_temporary_file.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-03-28 16:34:07 UTC (rev 309791)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-03-28 16:43:49 UTC (rev 309792)
@@ -6,10 +6,16 @@
(Dmitry)
- Core:
+ . Fixed a crash inside dtor for error handling. (Ilia)
. Fixed bug #54180 (parse_url() incorrectly parses path when ? in fragment).
(tomas dot brastavicius at quantum dot lt, Pierrick)
- . Fixed a crash inside dtor for error handling. (Ilia)
+ . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
+ TMPDIR on Windows). (Pierre)
+- cURL extension:
+ . Add curl.cainfo ini option to set the path to a defailt CA bundle file,
used
+by CURLOPT_CAINFO option. (Pierre)
+
- DateTime extension:
. Fixed bug #54340 (DateTime::add() method bug). (Adam)
. Fixed bug #54316 (DateTime::createFromFormat does not handle trailing '|'
Modified: php/php-src/branches/PHP_5_3/main/php_open_temporary_file.c
===
--- php/php-src/branches/PHP_5_3/main/php_open_temporary_file.c 2011-03-28
16:34:07 UTC (rev 309791)
+++ php/php-src/branches/PHP_5_3/main/php_open_temporary_file.c 2011-03-28
16:43:49 UTC (rev 309792)
@@ -204,9 +204,13 @@
*/
{
char sTemp[MAX_PATH];
- DWORD n = GetTempPath(sizeof(sTemp),sTemp);
- assert(0 n); /* should *never* fail! */
- temporary_directory = strdup(sTemp);
+ DWORD len = GetTempPath(sizeof(sTemp),sTemp);
+ assert(0 len); /* should *never* fail! */
+ if (sTemp[len - 1] == DEFAULT_SLASH) {
+ temporary_directory = zend_strndup(sTemp, len - 1);
+ } else {
+ temporary_directory = zend_strndup(sTemp, len);
+ }
return temporary_directory;
}
#else
Modified: php/php-src/trunk/main/php_open_temporary_file.c
===
--- php/php-src/trunk/main/php_open_temporary_file.c2011-03-28 16:34:07 UTC
(rev 309791)
+++ php/php-src/trunk/main/php_open_temporary_file.c2011-03-28 16:43:49 UTC
(rev 309792)
@@ -204,9 +204,13 @@
*/
{
char sTemp[MAX_PATH];
- DWORD n = GetTempPath(sizeof(sTemp),sTemp);
- assert(0 n); /* should *never* fail! */
- temporary_directory = strdup(sTemp);
+ DWORD len = GetTempPath(sizeof(sTemp),sTemp);
+ assert(0 len); /* should *never* fail! */
+ if (sTemp[len - 1] == DEFAULT_SLASH) {
+ temporary_directory = zend_strndup(sTemp, len - 1);
+ } else {
+ temporary_directory = zend_strndup(sTemp, len);
+ }
return temporary_directory;
}
#else
--
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 Mon, 28 Mar 2011 16:45:57 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309793 Log: - not applied yet 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 2011-03-28 16:43:49 UTC (rev 309792) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-28 16:45:57 UTC (rev 309793) @@ -12,10 +12,6 @@ . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using TMPDIR on Windows). (Pierre) -- cURL extension: - . Add curl.cainfo ini option to set the path to a defailt CA bundle file, used -by CURLOPT_CAINFO option. (Pierre) - - DateTime extension: . Fixed bug #54340 (DateTime::add() method bug). (Adam) . Fixed bug #54316 (DateTime::createFromFormat does not handle trailing '|' -- 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/ext/date/lib/ parse_date.c parse_date.re
On Mon, 28 Mar 2011, Nuno Lopes wrote: nlopess Mon, 28 Mar 2011 09:10:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309775 Log: fix last commit: - fix code coverage build - spread static love Changed paths: U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re Why is that .c file change so large? Did you use the little line in the ext/date/lib/README for re-generating the file? It's actually the opposite. I regenerated the file in the right way (as described in the README file). The previous commit (http://svn.php.net/viewvc?view=revisionrevision=309493) broke it, not me. Nuno -- 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/ext/date/lib/ parse_date.c parse_date.re
On Mon, 28 Mar 2011, Nuno Lopes wrote: On Mon, 28 Mar 2011, Nuno Lopes wrote: nlopess Mon, 28 Mar 2011 09:10:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=309775 Log: fix last commit: - fix code coverage build - spread static love Changed paths: U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.c U php/php-src/branches/PHP_5_3/ext/date/lib/parse_date.re Why is that .c file change so large? Did you use the little line in the ext/date/lib/README for re-generating the file? It's actually the opposite. I regenerated the file in the right way (as described in the README file). The previous commit (http://svn.php.net/viewvc?view=revisionrevision=309493) broke it, not me. Ah; great :-) cheers, Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
