[PHP-CVS] com php-src: Fix build on MS Windows: ext/standard/pack.c

[Gustavo André dos Santos Lopes]

Commit:ffec6144123b3d4fdd40be1d8d130f60cb2594d2
Author:Gustavo André dos Santos Lopes  Sat, 28 
Apr 2012 16:32:44 +0100
Parents:   a1f7423087c85ecd48a034d4a95a2bf19901f13d
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=ffec6144123b3d4fdd40be1d8d130f60cb2594d2

Log:
Fix build on MS Windows

Changed paths:
  M  ext/standard/pack.c


Diff:
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index a21d41b..61228a6 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -719,7 +719,8 @@ PHP_FUNCTION(unpack)
case 'Z': {
/* Z will strip everything 
after the first null character */
char pad = '\0';
-   int len = inputlen - inputpos;  
/* Remaining string */
+   int  s,
+len = inputlen - 
inputpos; /* Remaining string */
 
/* If size was given take 
minimum of len and size */
if ((size >= 0) && (len > 
size)) {
@@ -729,7 +730,7 @@ PHP_FUNCTION(unpack)
size = len;
 
/* Remove everything after the 
first null */
-   int s = 0;
+   s = 0;
while (s++ <= len) {
if (input[inputpos + s] 
== pad)
break;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] com php-src: Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime(): ext/calendar/tests/unixtojd.phpt

[Anatoliy Belsky]

Commit:dc6d283b1c277c2c99a794d17a2e2540a9f2e60e
Author:Matt Ficken  Sat, 28 Apr 2012 11:42:42 
+0200
Committer: Anatoliy Belsky   Sat, 28 Apr 2012 11:42:42 +0200
Parents:   4daab0abecd5ee583c005d8e7b6affc08af8639d
Branches:  PHP-5.3 PHP-5.4 master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=dc6d283b1c277c2c99a794d17a2e2540a9f2e60e

Log:
Fix bug 61685 putenv('TZ=UTC') doesn't update timezone for localtime()

Bugs:
https://bugs.php.net/61685

Changed paths:
  M  ext/calendar/tests/unixtojd.phpt


Diff:
diff --git a/ext/calendar/tests/unixtojd.phpt b/ext/calendar/tests/unixtojd.phpt
index 11edde5..4eeb1ca 100644
--- a/ext/calendar/tests/unixtojd.phpt
+++ b/ext/calendar/tests/unixtojd.phpt
@@ -2,9 +2,34 @@
 unixtojd()
 --SKIPIF--
 
+--ENV--
+TZ=UTC
 --FILE--
 http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php