[PHP-CVS] com php-src: Fixed test bug: ext/pgsql/tests/80_bug32223b.phpt

2013-08-19 Thread Yasuo Ohgaki 
Commit:7d538cf8dd41a2584c56ec4abfafd738f0fa1e31
Author:Yasuo Ohgaki  Tue, 20 Aug 2013 14:25:01 
+0900
Parents:   24288eb4d119ab4f613feb5c64cf0f08ecf8d10a
Branches:  master

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

Log:
Fixed test bug

Changed paths:
  M  ext/pgsql/tests/80_bug32223b.phpt


Diff:
diff --git a/ext/pgsql/tests/80_bug32223b.phpt 
b/ext/pgsql/tests/80_bug32223b.phpt
index 5291659..312fe46 100644
--- a/ext/pgsql/tests/80_bug32223b.phpt
+++ b/ext/pgsql/tests/80_bug32223b.phpt
@@ -37,13 +37,13 @@ begin
 end;
 ' LANGUAGE plpgsql;");
 
-$res = pg_query($dbh, 'SET client_min_messages TO NOTICE;');
+$res = pg_query(dbh, 'SET client_min_messages TO NOTICE;');
 var_dump($res);
 
 function tester() {
 $res = pg_query(dbh, 'SELECT test_notice()');
 $row = pg_fetch_row($res, 0);
-   var_dump($row);
+var_dump($row);
 pg_free_result($res);
 if ($row[0] == 'f')
 {
@@ -58,7 +58,6 @@ pg_close(dbh);
 ===DONE===
 --EXPECTF--
 resource(%d) of type (pgsql result)
-resource(%d) of type (pgsql result)
 array(1) {
   [0]=>
   string(1) "f"


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

[PHP-CVS] tag php-src: create tag php-5.5.3

2013-08-19 Thread Stanislav Malyshev 
Tag php-5.5.3 in php-src.git was created
Tag: 6c53e7552fb20c2509c3678ee2315494ee22061b
Tagger:  Stanislav Malyshev Mon Aug 19 21:50:53 2013 
-0700
Log:
5.5.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (Darwin)

iF4EABEIAAYFAlIS9bEACgkQL3lWvF2gS10/FAD9EI1/BWU9JJ4l0BYQt0w0n/i5
lfvzeCmy1ieNnP3fSM0A/jRhlLevBCYa/1DnXze/uVJ2YBbaqdYshuGrVSsM5Qf0
=C7nT
-END PGP SIGNATURE-

Link: 
http://git.php.net/?p=php-src.git;a=tag;h=6c53e7552fb20c2509c3678ee2315494ee22061b

Target:  d005ed9681d6797012570c4e32abb3abcdf3b72a
Author:  Stanislav Malyshev  Mon, 19 Aug 2013 
21:46:43 -0700
Parents: b7f033bd5de844e7cf0f1f7c2b884d582d4aa847
Target link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=d005ed9681d6797012570c4e32abb3abcdf3b72a
Target log:
5.5.3

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h



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

[PHP-CVS] tag php-src: create tag php-5.4.19

2013-08-19 Thread Stanislav Malyshev 
Tag php-5.4.19 in php-src.git was created
Tag: 0b328fe330ae60a6c570984baccb601b1fc0d86e
Tagger:  Stanislav Malyshev Mon Aug 19 21:50:26 2013 
-0700
Log:
5.4.19
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (Darwin)

iF4EABEIAAYFAlIS9ZcACgkQL3lWvF2gS112egD+JqnQswvsiAMx91JYhS6NYxk2
40ftd3a/WXQA1lWsl9gA/0+8B86ntb+Lf0gQaeWW7zNjXy0s8jU+K9uglEP22658
=mOH/
-END PGP SIGNATURE-

Link: 
http://git.php.net/?p=php-src.git;a=tag;h=0b328fe330ae60a6c570984baccb601b1fc0d86e

Target:  47a5e202bfb6e8b64accd1917b2ea975ee7e03a2
Author:  Stanislav Malyshev  Mon, 19 Aug 2013 
21:42:41 -0700
Parents: fe475fc8b721ba352299cfaea19ba66a66aa978b
Target link: 
http://git.php.net/?p=php-src.git;a=commitdiff;h=47a5e202bfb6e8b64accd1917b2ea975ee7e03a2
Target log:
5.4.19

Changed paths:
  M  configure.in
  M  main/php_version.h



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

[PHP-CVS] com php-src: PHP 5.5.2: configure.in main/php_version.h

2013-08-19 Thread Stanislav Malyshev 
Commit:29b4532f618973b80b6b7017b44139995dce697c
Author:David Soria Parra  Thu, 15 Aug 2013 22:42:04 
+0200
Parents:   f12f3abe8e529a1ddfcbcc857f95986b591bce9f
Branches:  PHP-5.5.3

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

Log:
PHP 5.5.2

Changed paths:
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/configure.in b/configure.in
index 19c96d4..41c2784 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
 PHP_RELEASE_VERSION=2
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION=""
 
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
 
diff --git a/main/php_version.h b/main/php_version.h
index e760d29..f1f201e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
 #define PHP_RELEASE_VERSION 2
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.2-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.2"
 #define PHP_VERSION_ID 50502


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

[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:b7f033bd5de844e7cf0f1f7c2b884d582d4aa847
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   29b4532f618973b80b6b7017b44139995dce697c
Branches:  PHP-5.5.3

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

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 4c3b2ec..98f3813 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1587,6 +1587,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


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

[PHP-CVS] com php-src: 5.5.3: NEWS configure.in main/php_version.h

2013-08-19 Thread Stanislav Malyshev 
Commit:d005ed9681d6797012570c4e32abb3abcdf3b72a
Author:Stanislav Malyshev  Mon, 19 Aug 2013 21:46:43 
-0700
Parents:   b7f033bd5de844e7cf0f1f7c2b884d582d4aa847
Branches:  PHP-5.5.3

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

Log:
5.5.3

Changed paths:
  M  NEWS
  M  configure.in
  M  main/php_version.h


Diff:
diff --git a/NEWS b/NEWS
index 0041bcf..07ea9c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,31 +1,11 @@
 PHPNEWS
 |||
-15 Aug 2013, PHP 5.5.2
-
-- Core:
-  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
-  . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
-  . Fixed bug #61268 (--enable-dtrace leads make to clobber
-Zend/zend_dtrace.d) (Chris Jones)
-
-- DOM:
-  . Added flags option to DOMDocument::schemaValidate() and 
-DOMDocument::schemaValidateSource(). Added LIBXML_SCHEMA_CREATE flag. 
-(Chris Wright)
+22 Aug 2013, PHP 5.5.3
 
-- Sessions:
-  . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
-which protects against session fixation attacks and session collisions.
-(Yasuo Ohgaki)
-  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
-(Yasuo)
-  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
-
-- Pgsql:
-  . Fixed bug #62978 (Disallow possible SQL injections with 
pg_select()/pg_update()
-/pg_delete()/pg_insert()). (Yasuo)
+- Openssl:
+  . Fixed UMR in fix for CVE-2013-4248.
 
-?? ??? 2013, PHP 5.5.2
+15 Aug 2013, PHP 5.5.2
 
 - Core:
   . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
@@ -36,26 +16,47 @@ PHP 
   NEWS
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
   . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
 limited case). (Arpad)
+  . Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
+  . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+Zend/zend_dtrace.d) (Chris Jones)
+
+- DOM:
+  . Added flags option to DOMDocument::schemaValidate() and 
+DOMDocument::schemaValidateSource(). Added LIBXML_SCHEMA_CREATE flag. 
+(Chris Wright)
 
 - OPcache:
   . Added opcache.restrict_api configuration directive that may limit
-usage of OPcahce API functions only to patricular script(s). (Dmitry)
+usage of OPcache API functions only to particular script(s). (Dmitry)
   . Added support for glob symbols in blacklist entries (?, *, **).
 (Terry Elison, Dmitry)
   . Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on
 shutdown). (Dmitry)
 
 - Openssl:
-  . Fixed handling null bytes in subjectAltName (CVE-2013-4073).
+  . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
 (Christian Heimes)
 
 - PDO_mysql:
   . Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
 
+- Pgsql:
+  . Fixed bug #62978 (Disallow possible SQL injections with 
pg_select()/pg_update()
+/pg_delete()/pg_insert()). (Yasuo)
+
 - Phar:
   . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
 some specific contents). (Stas)
 
+- Sessions:
+  . Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
+which protects against session fixation attacks and session collisions.
+(CVE-2011-4718). (Yasuo Ohgaki)
+  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
+(Yasuo)
+  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
+
 - SOAP:
   . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)
 
diff --git a/configure.in b/configure.in
index 41c2784..94498a6 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=2
+PHP_RELEASE_VERSION=3
 PHP_EXTRA_VERSION=""
 
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 
100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index f1f201e..89be332 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 2
+#define PHP_RELEASE_VERSION 3
 #define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.5.2"
-#define PHP_VERSION_ID 50502
+#define PHP_VERSION "5.5.3"
+#define PHP_VERSION_ID 50503


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

[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:66606b8462e7daef68f5a21bdebe20f288dfd49f
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   0780256c196a8a32f104a804b2d6eb029ccafa6a
Branches:  PHP-5.4.19

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

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index c32748c..7070177 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1574,6 +1574,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


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

[PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: Zend/zend_language_parser.y

2013-08-19 Thread Stanislav Malyshev 
Commit:910980b8a84969cdd76e2933881f24f6d215092b
Author:Xinchen Hui  Mon, 25 Mar 2013 23:48:21 
+0800
Committer: Stanislav Malyshev   Mon, 19 Aug 2013 21:35:33 
-0700
Parents:   66606b8462e7daef68f5a21bdebe20f288dfd49f
Branches:  PHP-5.4.19

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

Log:
Fixed bug #64503 (Compilation fails with error: conflicting types for 
'zendparse').

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

Changed paths:
  M  Zend/zend_language_parser.y


Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1f5d732..bf48bb7 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
 
 %}
 
 %pure_parser
 %expect 3
 
+%code requires {
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+}
+
 %token END 0 "end of file"
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %token T_INCLUDE  "include (T_INCLUDE)"


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

[PHP-CVS] com php-src: news for 5.4.19: NEWS

2013-08-19 Thread Stanislav Malyshev 
Commit:fe475fc8b721ba352299cfaea19ba66a66aa978b
Author:Stanislav Malyshev  Mon, 19 Aug 2013 21:37:29 
-0700
Parents:   910980b8a84969cdd76e2933881f24f6d215092b
Branches:  PHP-5.4.19

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

Log:
news for 5.4.19

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 12dfad8..e1e623e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
 PHPNEWS
 |||
+22 Aug 2013, PHP 5.4.19
+- Core:
+  . Fixed bug #64503 (Compilation fails with error: conflicting types for
+'zendparse'). (Laruence)
+
+- Openssl:
+  . Fixed UMR in fix for CVE-2013-4248. 
+
 15 Aug 2013, PHP 5.4.18
 
 - Core:
@@ -58,7 +66,7 @@ PHP   
 NEWS
 odbc_fetch_array). (Brandon Kirsch)
 
 - Openssl:
-  . Fixed handling null bytes in subjectAltName (CVE-2013-4073).
+  . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
 (Christian Heimes)
 
 - PDO:


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-08-19 Thread Christopher Jones 
Commit:19476f51f2167988909f5524d23444c05630
Author:Christopher Jones  Mon, 19 Aug 2013 17:18:28 
-0700
Parents:   73cd2e0ab14d804c6bf0b689490bdd4fd6e969b1 
d5979c88eaca273479cf244d3e10c2f089c4f080
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.
  Update NEWS

Changed paths:
  MM  ext/curl/interface.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:24288eb4d119ab4f613feb5c64cf0f08ecf8d10a
Author:Christopher Jones  Mon, 19 Aug 2013 17:58:53 
-0700
Parents:   5697aa57284bc6898b034aa5c968bc6a6e8c820c 
1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove compile warning:
  warning: unused variable ‘j’ [-Wunused-variable]

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:5697aa57284bc6898b034aa5c968bc6a6e8c820c
Author:Christopher Jones  Mon, 19 Aug 2013 17:51:04 
-0700
Parents:   19476f51f2167988909f5524d23444c05630 
83469477e70cba8191a4698252fc83804e88322b
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove compile warnings:
  warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used 
[-Wunused-but-set-variable]
  Remove compile warnings:
  variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]: ext/bz2/bz2_filter.c

2013-08-19 Thread Christopher Jones 
Commit:f69a5c520fd699a32d0787dc04984313b2b677ff
Author:Christopher Jones  Mon, 19 Aug 2013 17:46:50 
-0700
Parents:   cf7f50748a787affd9306b34ee1ba2c83772aedc
Branches:  PHP-5.5 master

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

Log:
Remove compile warning: variable ‘streamp’ set but not used 
[-Wunused-but-set-variable]

Changed paths:
  M  ext/bz2/bz2_filter.c


Diff:
diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c
index 5ed7921..3356002 100644
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@@ -215,7 +215,6 @@ static php_stream_filter_status_t php_bz2_compress_filter(
size_t consumed = 0;
int status;
php_stream_filter_status_t exit_status = PSFS_FEED_ME;
-   bz_stream *streamp;
 
if (!thisfilter || !thisfilter->abstract) {
/* Should never happen */
@@ -223,7 +222,6 @@ static php_stream_filter_status_t php_bz2_compress_filter(
}
 
data = (php_bz2_filter_data *)(thisfilter->abstract);
-   streamp = &(data->strm);
 
while (buckets_in->head) {
size_t bin = 0, desired;


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

[PHP-CVS] com php-src: Remove compile warning "variable ‘mekeylen’ set but not used": ext/intl/resourcebundle/resourcebundle_class.c

2013-08-19 Thread Christopher Jones 
Commit:279b4fe614ac8380d6bdea9f9b54a77ec60114db
Author:Christopher Jones  Mon, 19 Aug 2013 17:40:15 
-0700
Parents:   d5979c88eaca273479cf244d3e10c2f089c4f080
Branches:  PHP-5.5 master

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

Log:
Remove compile warning "variable ‘mekeylen’ set but not used"

Changed paths:
  M  ext/intl/resourcebundle/resourcebundle_class.c


Diff:
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c 
b/ext/intl/resourcebundle/resourcebundle_class.c
index 9c369bd..dc12124 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -163,7 +163,6 @@ static void resourcebundle_array_fetch(zval *object, zval 
*offset, zval *return_
 {
int32_t meindex = 0;
char *  mekey = NULL;
-   longmekeylen;
 zend_boolis_numeric = 0;
char *pbuf;
ResourceBundle_object *rb;
@@ -177,7 +176,6 @@ static void resourcebundle_array_fetch(zval *object, zval 
*offset, zval *return_
rb->child = ures_getByIndex( rb->me, meindex, rb->child, 
&INTL_DATA_ERROR_CODE(rb) );
} else if(Z_TYPE_P(offset) == IS_STRING) {
mekey = Z_STRVAL_P(offset);
-   mekeylen = Z_STRLEN_P(offset);
rb->child = ures_getByKey(rb->me, mekey, rb->child, 
&INTL_DATA_ERROR_CODE(rb) );
} else {
intl_errors_set(INTL_DATA_ERROR_P(rb), U_ILLEGAL_ARGUMENT_ERROR,


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

[PHP-CVS] com php-src: Remove compile warning: warning: unused variable ‘j’ [-Wunused-variable]: ext/openssl/openssl.c

2013-08-19 Thread Christopher Jones 
Commit:1a00b9bd264ba2495930be05cd0ed2b1c13b8ef8
Author:Christopher Jones  Mon, 19 Aug 2013 17:58:42 
-0700
Parents:   83469477e70cba8191a4698252fc83804e88322b
Branches:  PHP-5.5 master

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

Log:
Remove compile warning:
   warning: unused variable ‘j’ [-Wunused-variable]

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index f9493c7..4a9fcbc 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -576,7 +576,7 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
 {
zval **data;
zval *subitem, *subentries;
-   int i, j = -1;
+   int i;
char *sname;
int nid;
X509_NAME_ENTRY * ne;


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

[PHP-CVS] com php-src: Remove compile warnings: warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable] warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]: ext/ft

2013-08-19 Thread Christopher Jones 
Commit:83469477e70cba8191a4698252fc83804e88322b
Author:Christopher Jones  Mon, 19 Aug 2013 17:48:46 
-0700
Parents:   f69a5c520fd699a32d0787dc04984313b2b677ff
Branches:  PHP-5.5 master

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

Log:
Remove compile warnings:
  warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
  warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]

Changed paths:
  M  ext/ftp/ftp.c


Diff:
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 0d6704f..2c5bc5d 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -790,7 +790,6 @@ int
 ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t 
type, long resumepos TSRMLS_DC)
 {
databuf_t   *data = NULL;
-   int lastch;
size_t  rcvd;
chararg[11];
 
@@ -828,7 +827,6 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char 
*path, ftptype_t type,
goto bail;
}
 
-   lastch = 0;
while ((rcvd = my_recv(ftp, data->fd, data->buf, FTP_BUFSIZE))) {
if (rcvd == -1) {
goto bail;
@@ -1187,12 +1185,9 @@ ftp_readline(ftpbuf_t *ftp)
 int
 ftp_getresp(ftpbuf_t *ftp)
 {
-   char *buf;
-
if (ftp == NULL) {
return 0;
}
-   buf = ftp->inbuf;
ftp->resp = 0;
 
while (1) {


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

[PHP-CVS] com php-src: Remove compile warnings: variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable] unused variable ‘last’ [-Wunused-variable] unused variable ‘j’ [-Wunused-variable]

2013-08-19 Thread Christopher Jones 
Commit:cf7f50748a787affd9306b34ee1ba2c83772aedc
Author:Christopher Jones  Mon, 19 Aug 2013 17:44:36 
-0700
Parents:   279b4fe614ac8380d6bdea9f9b54a77ec60114db
Branches:  PHP-5.5 master

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

Log:
Remove compile warnings:
  variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
  unused variable ‘last’ [-Wunused-variable]
  unused variable ‘j’ [-Wunused-variable]

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 353c358..f9493c7 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -576,7 +576,7 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
 {
zval **data;
zval *subitem, *subentries;
-   int i, j = -1, last = -1, obj_cnt = 0;
+   int i, j = -1;
char *sname;
int nid;
X509_NAME_ENTRY * ne;
@@ -598,7 +598,6 @@ static void add_assoc_name_entry(zval * val, char * key, 
X509_NAME * name, int s
ne  = X509_NAME_get_entry(name, i);
obj = X509_NAME_ENTRY_get_object(ne);
nid = OBJ_obj2nid(obj);
-   obj_cnt = 0;
 
if (shortname) {
sname = (char *) OBJ_nid2sn(nid);


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

[PHP-CVS] com php-src: Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.: ext/curl/interface.c ext/intl/calendar/calendar_methods.cpp ext/intl/calendar/gr

2013-08-19 Thread Christopher Jones 
Commit:d5979c88eaca273479cf244d3e10c2f089c4f080
Author:Christopher Jones  Mon, 19 Aug 2013 17:17:54 
-0700
Parents:   4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73
Branches:  PHP-5.5 master

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

Log:
Reduce (some more) compile noise of 'unused variable' and 'may be used
uninitialized' warnings.

Changed paths:
  M  ext/curl/interface.c
  M  ext/intl/calendar/calendar_methods.cpp
  M  ext/intl/calendar/gregoriancalendar_methods.cpp
  M  ext/intl/msgformat/msgformat_helpers.cpp


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8617954..9fdb57c 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2441,7 +2441,7 @@ string_copy:
 
ph = HASH_OF(*zvalue);
if (!ph) {
-   char *name;
+   char *name = NULL;
switch (option) {
case CURLOPT_HTTPHEADER:
name = "CURLOPT_HTTPHEADER";
diff --git a/ext/intl/calendar/calendar_methods.cpp 
b/ext/intl/calendar/calendar_methods.cpp
index db10502..ae7d009 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -184,7 +184,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale)
 
 U_CFUNC PHP_FUNCTION(intlcal_get_now)
 {
-   UErrorCode  status  = U_ZERO_ERROR;
intl_error_reset(NULL TSRMLS_CC);
 
if (zend_parse_parameters_none() == FAILURE) {
diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp 
b/ext/intl/calendar/gregoriancalendar_methods.cpp
index 3c05253..08b8949 100644
--- a/ext/intl/calendar/gregoriancalendar_methods.cpp
+++ b/ext/intl/calendar/gregoriancalendar_methods.cpp
@@ -38,7 +38,6 @@ static inline GregorianCalendar *fetch_greg(Calendar_object 
*co) {
 
 static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
 {
-   zval*object = getThis();
zval**tz_object = NULL;
zval**args_a[6] = {0},
***args = &args_a[0];
@@ -84,7 +83,7 @@ static void 
_php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
}

// instantion of ICU object
-   GregorianCalendar *gcal;
+   GregorianCalendar *gcal = NULL;
 
if (variant <= 2) {
// From timezone and locale (0 to 2 arguments)
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp 
b/ext/intl/msgformat/msgformat_helpers.cpp
index 9ee1cdc..c4456d5 100644
--- a/ext/intl/msgformat/msgformat_helpers.cpp
+++ b/ext/intl/msgformat/msgformat_helpers.cpp
@@ -487,7 +487,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object 
*mfo,
}
case Formattable::kLong:
{
-   int32_t tInt32;
+   int32_t tInt32 = 0;
 retry_klong:
if (Z_TYPE_PP(elem) == IS_DOUBLE) {
if (Z_DVAL_PP(elem) > 
(double)INT32_MAX ||
@@ -517,7 +517,7 @@ retry_klong:
}
case Formattable::kInt64:
{
-   int64_t tInt64;
+   int64_t tInt64 = 0;
 retry_kint64:
if (Z_TYPE_PP(elem) == IS_DOUBLE) {
if (Z_DVAL_PP(elem) > 
(double)U_INT64_MAX ||


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-19 Thread Christopher Jones 
Commit:c60067c09a32af325d6cd70e4cfa6db3c78a8621
Author:Christopher Jones  Mon, 19 Aug 2013 17:14:15 
-0700
Parents:   1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Branches:  PHP-5.4

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

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index e56ff28..8894bb4 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ PHP 
   NEWS
 - Core:
   . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
   . Fixed bug #65470 (Segmentation fault in zend_error() with 
---enable-dtrace). (Chris Jones)
+--enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
 fails). (Laruence)
   . Fixed bug #65304 (Use of max int in array_sum). (Laruence)


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

[PHP-CVS] com php-src: Update NEWS: NEWS

2013-08-19 Thread Christopher Jones 
Commit:4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73
Author:Christopher Jones  Mon, 19 Aug 2013 17:14:38 
-0700
Parents:   9d2cdacf4a36045120aab049b03229bf0064df4e
Branches:  PHP-5.5

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

Log:
Update NEWS

Changed paths:
  M  NEWS


Diff:
diff --git a/NEWS b/NEWS
index 634e6b9..645efed 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ PHP 
   NEWS
 
 - Core:
   . Fixed bug #65470 (Segmentation fault in zend_error() with
---enable-dtrace). (Chris Jones)
+--enable-dtrace). (Chris Jones, Kris Van Hees)
   . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
   . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van 
Hees)


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/var_unserializer.c

2013-08-19 Thread Michael Wallner 
Commit:9d2cdacf4a36045120aab049b03229bf0064df4e
Author:Michael Wallner  Tue, 20 Aug 2013 00:08:55 
+0200
Parents:   69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d 
1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Branches:  master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #65481 (shutdown segfault due to serialize)

Conflicts:
ext/standard/var_unserializer.c

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

Changed paths:
  MM  ext/standard/var_unserializer.c


Diff:



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

[PHP-CVS] com php-src: fix bug #65481 (shutdown segfault due to serialize): NEWS ext/standard/php_var.h ext/standard/tests/serialize/bug65481.phpt ext/standard/var_unserializer.c ext/standard/var_unse

2013-08-19 Thread Michael Wallner 
Commit:1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Author:Michael Wallner  Mon, 29 Jul 2013 17:59:35 
+0200
Parents:   aa7d3d8e6d8de73ebe8dd015fb5392a4bde5bfc6
Branches:  master

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

Log:
fix bug #65481 (shutdown segfault due to serialize)

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

Changed paths:
  M  NEWS
  M  ext/standard/php_var.h
  A  ext/standard/tests/serialize/bug65481.phpt
  M  ext/standard/var_unserializer.c
  M  ext/standard/var_unserializer.re

diff --git a/NEWS b/NEWS
index 64e049d..e56ff28 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 
   NEWS
 ?? ??? 2013, PHP 5.4.19
 
 - Core:
+  . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
   . Fixed bug #65470 (Segmentation fault in zend_error() with 
 --enable-dtrace). (Chris Jones)
   . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index 35343b3..afc5f17 100644
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -115,6 +115,7 @@ do { \
 
 PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval 
**nzval);
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val);
+PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval 
**rval);
 PHPAPI void var_destroy(php_unserialize_data_t *var_hash);
 
 #define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \
diff --git a/ext/standard/tests/serialize/bug65481.phpt 
b/ext/standard/tests/serialize/bug65481.phpt
new file mode 100644
index 000..65634f6
--- /dev/null
+++ b/ext/standard/tests/serialize/bug65481.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #65481 (shutdown segfault due to serialize)
+--FILE--
+e[] = $e;
+   $e->e = $c->e;
+   }
+
+   return serialize(array(serialize($c)));
+   }
+
+   public function unserialize($str)
+   {
+   $r = unserialize($str);
+   $r = unserialize($r[0]);
+   }
+}
+
+$token = new Token;
+$token = serialize($token);
+
+?>
+Done
+--EXPECT--
+Test
+Done
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index d8bae08..8a35e0a 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Mar  9 22:33:09 2013 */
+/* Generated by re2c 0.13.5 on Mon Jul 29 17:57:26 2013 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +--+
@@ -26,6 +26,7 @@
 
 /* {{{ reference-handling for unserializer: var_* */
 #define VAR_ENTRIES_MAX 1024
+#define VAR_ENTRIES_DBG 0
 
 typedef struct {
zval *data[VAR_ENTRIES_MAX];
@@ -36,7 +37,7 @@ typedef struct {
 static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
 {
var_entries *var_hash = (*var_hashx)->last;
-#if 0
+#if VAR_ENTRIES_DBG
fprintf(stderr, "var_push(%ld): %d\n", 
var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -60,7 +61,7 @@ static inline void var_push(php_unserialize_data_t 
*var_hashx, zval **rval)
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
 {
var_entries *var_hash = (*var_hashx)->last_dtor;
-#if 0
+#if VAR_ENTRIES_DBG
fprintf(stderr, "var_push_dtor(%ld): %d\n", 
var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -82,11 +83,35 @@ PHPAPI void var_push_dtor(php_unserialize_data_t 
*var_hashx, zval **rval)
var_hash->data[var_hash->used_slots++] = *rval;
 }
 
+PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval 
**rval)
+{
+   var_entries *var_hash = (*var_hashx)->last_dtor;
+#if VAR_ENTRIES_DBG
+   fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", 
var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval));
+#endif
+
+   if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) {
+   var_hash = emalloc(sizeof(var_entries));
+   var_hash->used_slots = 0;
+   var_hash->next = 0;
+
+   if (!(*var_hashx)->first_dtor) {
+   (*var_hashx)->first_dtor = var_hash;
+   } else {
+   ((var_entries *) (*var_hashx)->last_dtor)->next = 
var_hash;
+   }
+
+   (*var_hashx)->last_dtor = var_hash;
+   }
+
+   var_hash->data[var_hash->used_slots++] = *rval;
+}
+
 PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval 
**nzval)
 {
long i;
var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
fprintf(stderr, "var_replace(%ld): %d\n", 
var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(nzval));
 #endif

@@ -104,7 +129,7 @@ PHPAPI void var_replace(php_unserialize_data_t *var_hashx, 
zval *

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/curl/interface.c

2013-08-19 Thread Adam Harvey 
Commit:2a46fc0470c0cec055178af8cb962c8d52fb4700
Author:Adam Harvey  Mon, 19 Aug 2013 12:19:13 -0700
Parents:   d17ade127b4f0b546c0fd1d11b915c485ceea9ea 
69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
ext/curl/interface.c

Changed paths:
  MM  ext/curl/interface.c


Diff:
diff --cc ext/curl/interface.c
index 8061867,8617954..a1c8a1e
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1790,9 -1790,11 +1790,11 @@@ static void alloc_curl_handle(php_curl 
(*ch)->handlers->read->stream = NULL;
  
zend_llist_init(&(*ch)->to_free->str,   sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
-   zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), 
(llist_dtor_func_t) curl_free_slist,  0);
zend_llist_init(&(*ch)->to_free->post,  sizeof(struct HttpPost),   
(llist_dtor_func_t) curl_free_post,   0);
 -  (*ch)->safe_upload = 0; /* for now, for BC reason we allow unsafe API */
 +  (*ch)->safe_upload = 1; /* for now, for BC reason we allow unsafe API */
+ 
+   (*ch)->to_free->slist = emalloc(sizeof(HashTable));
+   zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
  }
  /* }}} */


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/curl/interface.c ext/curl/php_curl.h

2013-08-19 Thread Adam Harvey 
Commit:69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d
Author:Adam Harvey  Mon, 19 Aug 2013 12:16:36 -0700
Parents:   d2c78c9e2039b0dfd14587800e24b30ff0ab0e1e 
aa7d3d8e6d8de73ebe8dd015fb5392a4bde5bfc6
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
ext/curl/interface.c

Changed paths:
  MM  NEWS
  MM  ext/curl/interface.c
  MM  ext/curl/php_curl.h

diff --cc NEWS
index d5d2cda,64e049d..634e6b9
--- a/NEWS
+++ b/NEWS
@@@ -1,25 -1,12 +1,28 @@@
  PHP
NEWS
  
|||
 -?? ??? 2013, PHP 5.4.19
 +?? ??? 2013, PHP 5.5.3
  
  - Core:
 -  . Fixed bug #65470 (Segmentation fault in zend_error() with 
 +  . Fixed bug #65470 (Segmentation fault in zend_error() with
  --enable-dtrace). (Chris Jones)
 +  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
 +  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van 
Hees)
 +
++- cURL:
++  . Fixed bug #65458 (curl memory leak). (Adam)
++
 +- Openssl:
 +  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in
 +some cases). (Mark Jones)
 +
 +15 Aug 2013, PHP 5.5.2
 +
 +- Core:
. Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
  fails). (Laruence)
 +  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
 +erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
 +avp200681 gmail com).
. Fixed bug #65304 (Use of max int in array_sum). (Laruence)
. Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
  limited case). (Arpad)
diff --cc ext/curl/interface.c
index 4b6e5e2,f79d0d5..8617954
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1790,9 -1443,10 +1790,11 @@@ static void alloc_curl_handle(php_curl 
(*ch)->handlers->read->stream = NULL;
  
zend_llist_init(&(*ch)->to_free->str,   sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
-   zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), 
(llist_dtor_func_t) curl_free_slist,  0);
zend_llist_init(&(*ch)->to_free->post,  sizeof(struct HttpPost),   
(llist_dtor_func_t) curl_free_post,   0);
 +  (*ch)->safe_upload = 0; /* for now, for BC reason we allow unsafe API */
+ 
+   (*ch)->to_free->slist = emalloc(sizeof(HashTable));
+   zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
  }
  /* }}} */
  
@@@ -2019,30 -1675,9 +2021,31 @@@ PHP_FUNCTION(curl_copy_handle
curl_easy_setopt(dupch->cp, CURLOPT_FILE,  (void *) dupch);
curl_easy_setopt(dupch->cp, CURLOPT_INFILE,(void *) dupch);
curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER,   (void *) dupch);
 -  curl_easy_setopt(dupch->cp, CURLOPT_PROGRESSDATA,  (void *) dupch); 
 +
 +  if (ch->handlers->progress) {
 +  dupch->handlers->progress = ecalloc(1, 
sizeof(php_curl_progress));
 +  if (ch->handlers->progress->func_name) {
 +  zval_add_ref(&ch->handlers->progress->func_name);
 +  dupch->handlers->progress->func_name = 
ch->handlers->progress->func_name;
 +  }
 +  dupch->handlers->progress->method = 
ch->handlers->progress->method;
 +  curl_easy_setopt(dupch->cp, CURLOPT_PROGRESSDATA, (void *) 
dupch);
 +  }
 +
 +/* Available since 7.21.0 */
 +#if LIBCURL_VERSION_NUM >= 0x071500
 +  if (ch->handlers->fnmatch) {
 +  dupch->handlers->fnmatch = ecalloc(1, sizeof(php_curl_fnmatch));
 +  if (ch->handlers->fnmatch->func_name) {
 +  zval_add_ref(&ch->handlers->fnmatch->func_name);
 +  dupch->handlers->fnmatch->func_name = 
ch->handlers->fnmatch->func_name;
 +  }
 +  dupch->handlers->fnmatch->method = 
ch->handlers->fnmatch->method;
 +  curl_easy_setopt(dupch->cp, CURLOPT_FNMATCH_DATA, (void *) 
dupch);
 +  }
 +#endif
  
+   efree(dupch->to_free->slist);
efree(dupch->to_free);
dupch->to_free = ch->to_free;
  
@@@ -2415,102 -1973,56 +2418,102 @@@ string_copy
error = curl_easy_setopt(ch->cp, 
option, fp);
break;
}
 -
break;
}
 -  case CURLOPT_RETURNTRANSFER:
 -  convert_to_long_ex(zvalue);
  
 -  if (Z_LVAL_PP(zvalue)) {
 -  ch->handlers->write->method = PHP_CURL_RETURN;
 -  } else {
 -  ch->handlers->

[PHP-CVS] com php-src: Track created curl_slist structs by option so they can be updated in situ.: NEWS ext/curl/interface.c ext/curl/php_curl.h ext/curl/tests/bug65458.phpt

2013-08-19 Thread Adam Harvey 
Commit:aa7d3d8e6d8de73ebe8dd015fb5392a4bde5bfc6
Author:Adam Harvey  Mon, 19 Aug 2013 11:58:57 -0700
Parents:   a4862503d485abf449e0565ac03157d859a31bf7
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Track created curl_slist structs by option so they can be updated in situ.

At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.

This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.

Fixes bug #65458 (curl memory leak).

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

Changed paths:
  M  NEWS
  M  ext/curl/interface.c
  M  ext/curl/php_curl.h
  A  ext/curl/tests/bug65458.phpt


Diff:
diff --git a/NEWS b/NEWS
index ff79a29..64e049d 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ PHP   
 NEWS
   . Fixed bug #61268 (--enable-dtrace leads make to clobber
 Zend/zend_dtrace.d) (Chris Jones)
 
+- cURL:
+  . Fixed bug #65458 (curl memory leak). (Adam)
+
 - Openssl:
   . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in 
 some cases). (Mark Jones)
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 531f15b..f79d0d5 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1373,9 +1373,9 @@ static void curl_free_post(void **post)
 
 /* {{{ curl_free_slist
  */
-static void curl_free_slist(void **slist)
+static void curl_free_slist(void *slist)
 {
-   curl_slist_free_all((struct curl_slist *) *slist);
+   curl_slist_free_all(*((struct curl_slist **) slist));
 }
 /* }}} */
 
@@ -1443,8 +1443,10 @@ static void alloc_curl_handle(php_curl **ch)
(*ch)->handlers->read->stream = NULL;
 
zend_llist_init(&(*ch)->to_free->str,   sizeof(char *),
(llist_dtor_func_t) curl_free_string, 0);
-   zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), 
(llist_dtor_func_t) curl_free_slist,  0);
zend_llist_init(&(*ch)->to_free->post,  sizeof(struct HttpPost),   
(llist_dtor_func_t) curl_free_post,   0);
+
+   (*ch)->to_free->slist = emalloc(sizeof(HashTable));
+   zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
 }
 /* }}} */
 
@@ -1675,6 +1677,7 @@ PHP_FUNCTION(curl_copy_handle)
curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER,   (void *) dupch);
curl_easy_setopt(dupch->cp, CURLOPT_PROGRESSDATA,  (void *) dupch); 
 
+   efree(dupch->to_free->slist);
efree(dupch->to_free);
dupch->to_free = ch->to_free;
 
@@ -2184,7 +2187,7 @@ string_copy:
return 1;
}
}
-   zend_llist_add_element(&ch->to_free->slist, &slist);
+   zend_hash_index_update(ch->to_free->slist, (ulong) 
option, &slist, sizeof(struct curl_slist *), NULL);
 
error = curl_easy_setopt(ch->cp, option, slist);
 
@@ -2680,8 +2683,9 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
/* cURL destructors should be invoked only by last curl handle */
if (Z_REFCOUNT_P(ch->clone) <= 1) {
zend_llist_clean(&ch->to_free->str);
-   zend_llist_clean(&ch->to_free->slist);
zend_llist_clean(&ch->to_free->post);
+   zend_hash_destroy(ch->to_free->slist);
+   efree(ch->to_free->slist);
efree(ch->to_free);
FREE_ZVAL(ch->clone);
} else {
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 945f0a4..911d87a 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -126,7 +126,7 @@ struct _php_curl_send_headers {
 struct _php_curl_free {
zend_llist str;
zend_llist post;
-   zend_llist slist;
+   HashTable *slist;
 };
 
 typedef struct {
diff --git a/ext/curl/tests/bug65458.phpt b/ext/curl/tests/bug65458.phpt
new file mode 100644
index 000..99288f2
--- /dev/null
+++ b/ext/curl/tests/bug65458.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #65458 (curl memory leak)
+--SKIPIF--
+
+--FILE--
+
+--EXPECT--
+bool(true)


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

[PHP-CVS] svn: /SVNROOT/ global_avail

2013-08-19 Thread Hannes Magnusson 
bjoriMon, 19 Aug 2013 18:39:00 +

Revision: http://svn.php.net/viewvc?view=revision&revision=331164

Log:
give chris doc karma

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2013-08-19 12:54:37 UTC (rev 331163)
+++ SVNROOT/global_avail2013-08-19 18:39:00 UTC (rev 331164)
@@ -102,7 +102,7 @@
 avail|aferreira,thiago|phpdoc/pt
 
avail|machado,scar,davis,dnfeitosa,thiago,amandavale,rafa,klaussilveira,kinncj,malukenho,fibbarth|phpdoc/pt_BR
 avail|radical,shoty|phpdoc/ro
-avail|aur,irker,oaass,ralphschindler,kazymjir,whatthejeff|phpdoc/en
+avail|aur,irker,oaass,ralphschindler,kazymjir,whatthejeff,daverandom|phpdoc/en
 
avail|freespace,shafff,sveta,wanderer,kozloffsky,santiago,seprize,irker,mch,aur,das,tmn,bfl,countzero,alien,northcat|phpdoc/ru
 
avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster,antimon,yelekin,ecamalan|phpdoc/tr
 avail|pfischer|phpdoc/es

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

[PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: Zend/zend_language_parser.y

2013-08-19 Thread Stanislav Malyshev 
Commit:7a79cf0206de62e61f3afe17e0665cb076a8a925
Author:Xinchen Hui  Mon, 25 Mar 2013 23:48:21 
+0800
Committer: Stanislav Malyshev   Mon, 19 Aug 2013 10:42:47 
-0700
Parents:   cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4
Branches:  PHP-5.5 master

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

Log:
Fixed bug #64503 (Compilation fails with error: conflicting types for 
'zendparse').

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

Changed paths:
  M  Zend/zend_language_parser.y


Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1f5d732..bf48bb7 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
 
 %}
 
 %pure_parser
 %expect 3
 
+%code requires {
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+}
+
 %token END 0 "end of file"
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %token T_INCLUDE  "include (T_INCLUDE)"


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

[PHP-CVS] com php-src: Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').: Zend/zend_language_parser.y

2013-08-19 Thread Stanislav Malyshev 
Commit:a4862503d485abf449e0565ac03157d859a31bf7
Author:Xinchen Hui  Mon, 25 Mar 2013 23:48:21 
+0800
Committer: Stanislav Malyshev   Mon, 19 Aug 2013 11:18:51 
-0700
Parents:   4bad49e3bcb8851b6bdf7ce8e8405a12d0eec6d0
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Fixed bug #64503 (Compilation fails with error: conflicting types for 
'zendparse').

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

Changed paths:
  M  Zend/zend_language_parser.y


Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1f5d732..bf48bb7 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
 
 %}
 
 %pure_parser
 %expect 3
 
+%code requires {
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+}
+
 %token END 0 "end of file"
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %token T_INCLUDE  "include (T_INCLUDE)"


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

[PHP-CVS] com php-src: fixed glob() edge case on windows, ref bug #47358: ext/standard/dir.c ext/standard/tests/file/glob_variation3.phpt

2013-08-19 Thread Anatol Belski 
Commit:f4df40108be641a4167f6f6c1c3989958dda438a
Author:Anatol Belski  Mon, 19 Aug 2013 14:21:16 +0200
Parents:   f61b648da4df521b0aaed1c588ae3ac3ab2e540b
Branches:  master

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

Log:
fixed glob() edge case on windows, ref bug #47358

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

Changed paths:
  M  ext/standard/dir.c
  M  ext/standard/tests/file/glob_variation3.phpt


Diff:
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 55326db..ca7e576 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -491,11 +491,18 @@ PHP_FUNCTION(glob)
/* now catch the FreeBSD style of "no matches" */
if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
 no_results:
+#ifndef PHP_WIN32
+   /* Paths containing '*', '?' and some other chars are
+   illegal on Windows but legit on other platforms. For
+   this reason the direct basedir check against the glob
+   query is senseless on windows. For instance while *.txt
+   is a pretty valid filename on EXT3, it's invalid on NTFS. */
if (PG(open_basedir) && *PG(open_basedir)) {
if (php_check_open_basedir_ex(pattern, 0 TSRMLS_CC)) {
RETURN_FALSE;
}
}
+#endif
array_init(return_value);
return;
}
diff --git a/ext/standard/tests/file/glob_variation3.phpt 
b/ext/standard/tests/file/glob_variation3.phpt
index 4f504e6..9c57ada 100644
--- a/ext/standard/tests/file/glob_variation3.phpt
+++ b/ext/standard/tests/file/glob_variation3.phpt
@@ -6,9 +6,27 @@ $path = dirname(__FILE__);
 
 ini_set('open_basedir', NULL);
 var_dump(glob("$path/*.none"));
+var_dump(glob("$path/?.none"));
+var_dump(glob("$path/*{hello,world}.none"));
+var_dump(glob("$path/*/nothere"));
+var_dump(glob("$path/[aoeu]*.none"));
+var_dump(glob("$path/directly_not_exists"));
 
 ini_set('open_basedir', $path);
 var_dump(glob("$path/*.none"));
+var_dump(glob("$path/?.none"));
+var_dump(glob("$path/*{hello,world}.none"));
+var_dump(glob("$path/*/nothere"));
+var_dump(glob("$path/[aoeu]*.none"));
+var_dump(glob("$path/directly_not_exists"));
+
+ini_set('open_basedir', '/tmp');
+var_dump(glob("$path/*.none"));
+var_dump(glob("$path/?.none"));
+var_dump(glob("$path/*{hello,world}.none"));
+var_dump(glob("$path/*/nothere"));
+var_dump(glob("$path/[aoeu]*.none"));
+var_dump(glob("$path/directly_not_exists"));
 
 ?>
 ==DONE==
@@ -17,4 +35,36 @@ array(0) {
 }
 array(0) {
 }
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
 ==DONE==


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

[PHP-CVS] com php-src: modified the new glob() test for master: ext/standard/tests/file/glob_variation3.phpt

2013-08-19 Thread Anatol Belski 
Commit:f61b648da4df521b0aaed1c588ae3ac3ab2e540b
Author:Anatol Belski  Mon, 19 Aug 2013 11:22:18 +0200
Parents:   6c570ad322c7f21b2a9f59c85fd1619b83656b1d
Branches:  master

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

Log:
modified the new glob() test for master

Changed paths:
  M  ext/standard/tests/file/glob_variation3.phpt


Diff:
diff --git a/ext/standard/tests/file/glob_variation3.phpt 
b/ext/standard/tests/file/glob_variation3.phpt
index 9e1e28b..4f504e6 100644
--- a/ext/standard/tests/file/glob_variation3.phpt
+++ b/ext/standard/tests/file/glob_variation3.phpt
@@ -15,5 +15,6 @@ var_dump(glob("$path/*.none"));
 --EXPECT--
 array(0) {
 }
-bool(false)
+array(0) {
+}
 ==DONE==


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

[PHP-CVS] com php-src: added new glob() test: ext/standard/tests/file/glob_variation3.phpt

2013-08-19 Thread Anatol Belski 
Commit:4bad49e3bcb8851b6bdf7ce8e8405a12d0eec6d0
Author:Anatol Belski  Mon, 19 Aug 2013 11:17:13 +0200
Parents:   cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
added new glob() test

Changed paths:
  A  ext/standard/tests/file/glob_variation3.phpt


Diff:
diff --git a/ext/standard/tests/file/glob_variation3.phpt 
b/ext/standard/tests/file/glob_variation3.phpt
new file mode 100644
index 000..9e1e28b
--- /dev/null
+++ b/ext/standard/tests/file/glob_variation3.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Test glob() function: ensure no platform difference
+--FILE--
+
+==DONE==
+--EXPECT--
+array(0) {
+}
+bool(false)
+==DONE==


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

[PHP-CVS] com php-src: Merge branch 'PHP-5.5': ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:cfe58335797f7f4fda28d52c67327489974bb43a
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:07:50 
-0700
Parents:   ecd67ed3e5a1c62fdf879a38c500e01ef453d0be 
8e0f1100990c5a2e9ccc91e76ae884cbbdf24356
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix using wrong buffer pointer

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:8e0f1100990c5a2e9ccc91e76ae884cbbdf24356
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:04:19 
-0700
Parents:   bcf785fb6667194ff70ef6f903189a495c15eb40 
cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4
Branches:  PHP-5.5 master

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

Log:
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix using wrong buffer pointer

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:03:18 
-0700
Parents:   14f5732096575f3c4ff0438e6650238370cb465c 
c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b
Branches:  PHP-5.4 PHP-5.5 master

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

Log:
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix using wrong buffer pointer

Changed paths:
  MM  ext/openssl/openssl.c


Diff:



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

[PHP-CVS] com php-src: fix using wrong buffer pointer: ext/openssl/openssl.c

2013-08-19 Thread Stanislav Malyshev 
Commit:c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b
Author:Stanislav Malyshev  Mon, 19 Aug 2013 01:02:12 
-0700
Parents:   dcea4ec698dcae39b7bba6f6aa08933cbfee6755
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

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

Log:
fix using wrong buffer pointer

Changed paths:
  M  ext/openssl/openssl.c


Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index c7a9f5c..e7672e4 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1502,6 +1502,7 @@ PHP_FUNCTION(openssl_x509_parse)
bio_out = BIO_new(BIO_s_mem());
if (nid == NID_subject_alt_name) {
if (openssl_x509v3_subjectAltName(bio_out, extension) 
== 0) {
+   BIO_get_mem_ptr(bio_out, &bio_buf);
add_assoc_stringl(subitem, extname, 
bio_buf->data, bio_buf->length, 1);
} else {
zval_dtor(return_value);


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