[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: 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.5': ext/openssl/openssl.c

2013-08-18 Thread Stanislav Malyshev 
Commit:12c2a8a5eb97049ec0f68369dfe8516ffde87bf3
Author:Stanislav Malyshev  Sun, 18 Aug 2013 16:55:03 
-0700
Parents:   42214b647408ff8730ac8bb023be9023a8c97f90 
bd29ff7c38a14a0273329180c0e9f4d7a12e0d74
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix for php bug #64802 includes test case

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

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-13 Thread Stanislav Malyshev 
Commit:4da62730927ea469e74577a269072ed1069ab05f
Author:Stanislav Malyshev  Tue, 13 Aug 2013 22:26:32 
-0700
Parents:   b6fa0b40f7e1f942febdc35513f310a5880c4eb0 
2b9f5ac2525118bab372d5fc66eb19cabc46f483
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes

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-07-23 Thread Anatol Belski 
Commit:678ef6a13334bbabef9781dacaa1e9c46a243fbf
Author:Anatol Belski  Tue, 23 Jul 2013 18:07:16 +0200
Parents:   416e2708358d5cfbb72958da7328e834c4b8d07a 
f00d796b7ef290b4fa515ae09afc34f17201528f
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix missing include

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