Re: [PHP-CVS] com php-src: Merge branch 'generators': Zend/zend_compile.c Zend/zend_compile.h

2012-09-09 Thread Christopher Jones 



On 09/01/2012 10:07 AM, Gustavo André dos Santos Lopes wrote:

Commit:53351d087dfa94569a7a65b9f4167e8f0765e05a
Author:Gustavo Lopes  Sat, 1 Sep 2012 
19:07:20 +0200
Parents:   7b5960b08577700275468b396e6f962e0b70 
dbc7809b1746ef5dd895e6cd369134cb5270ae0b
Branches:  master

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

Log:
Merge branch 'generators'


Can UPGRADING/NEWS be updated?

Chris

--
christopher.jo...@oracle.com
http://twitter.com/#!/ghrd

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

[PHP-CVS] com php-src: Fix doc bug #63032 (Number of release in documentation).: CODING_STANDARDS

2012-09-09 Thread Adam Harvey 
Commit:f66642aae10fbf77d536a4a4ac68602124e41ae0
Author:Adam Harvey  Mon, 10 Sep 2012 10:05:15 +0800
Parents:   b29dc146b9311c14186c14bcb1c8ae5288b65d73
Branches:  PHP-5.3 PHP-5.4 master

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

Log:
Fix doc bug #63032 (Number of release in documentation).

Also add a bonus grammar fix.

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

Changed paths:
  M  CODING_STANDARDS


Diff:
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index ae8ee04..7413be4 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -2,11 +2,11 @@
   PHP Coding Standards
 
 
-This file lists several standards that any programmer, adding or changing
-code in PHP, should follow.  Since this file was added at a very late
+This file lists several standards that any programmer adding or changing
+code in PHP should follow.  Since this file was added at a very late
 stage of the development of PHP v3.0, the code base does not (yet) fully
 follow it, but it's going in that general direction.  Since we are now
-well into the version 4 releases, many sections have been recoded to use
+well into version 5 releases, many sections have been recoded to use
 these rules.
 
 Code Implementation


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

[PHP-CVS] com php-src: - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry): win32/registry.c

2012-09-09 Thread Stanislav Malyshev 
Commit:d1b8eeb2d8dda8bc2697d0dcea9c129f6fc77b9a
Author:Felipe Pena  Thu, 30 Aug 2012 09:32:13 
-0300
Committer: Stanislav Malyshev   Sun, 9 Sep 2012 14:54:13 -0700
Parents:   7fcf36cfef896da78d64f656d975ece7d48aa359
Branches:  PHP-5.4.7

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

Log:
- Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
Windows registry)

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

Changed paths:
  M  win32/registry.c


Diff:
diff --git a/win32/registry.c b/win32/registry.c
index 45e842b..638d85a 100644
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -77,12 +77,13 @@ static int LoadDirectory(HashTable *directories, HKEY key, 
char *path, int path_
value_len = max_value+1;
if (RegEnumValue(key, i, name, &name_len, NULL, 
&type, value, &value_len) == ERROR_SUCCESS) {
if ((type == REG_SZ) || (type == 
REG_EXPAND_SZ)) {
-   ht = 
(HashTable*)malloc(sizeof(HashTable));
if (!ht) {
-   return ret;
+   ht = 
(HashTable*)malloc(sizeof(HashTable));
+   if (!ht) {
+   return ret;
+   }
+   zend_hash_init(ht, 0, 
NULL, ZVAL_INTERNAL_PTR_DTOR, 1);
}
-   zend_hash_init(ht, 0, NULL, 
ZVAL_INTERNAL_PTR_DTOR, 1);
-
data = 
(zval*)malloc(sizeof(zval));
if (!data) {
return ret;


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