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

2013-10-21 Thread Stanislav Malyshev 
Commit:cb47396d4601656173cffadf86f6342bcba5e2b7
Author:Stanislav Malyshev s...@php.net Mon, 21 Oct 2013 00:02:21 
-0700
Parents:   00697927d8d99bec2c7135fe62d5807544fe12f8 
f860486de5805eefd63af5d750c913e1515970c8
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  fix memory leak on error (from Coverity scan)

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c

2013-08-30 Thread Remi Collet 
Commit:a5749eb0cbe6edb91ba0d5d79bbeedaeabf3788a
Author:Remi Collet r...@php.net Fri, 30 Aug 2013 10:43:12 +0200
Parents:   4e3de606b54425029cc4617215a3360bb8550b2f 
d69513afecf3d82c6bfba35ef1634b3b7c377d87
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by 
AddressSanitizer

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

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c

2013-08-25 Thread Stanislav Malyshev 
Commit:c0bfccafd2b09e3772adbade33b1e47bd15fcc97
Author:Stanislav Malyshev s...@php.net Sat, 24 Aug 2013 23:38:54 
-0700
Parents:   a89e71397d5842e5a322378867ec571739d1c829 
b378b0b081c2c3dd4a7aa25ce4d37bad48db752e
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fix DateInterval-days value when object was created not from DateTime::diff()

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c ext/intl/resourcebundle/resourcebundle_class.c ext/openssl/openssl.c ext/openssl/xp_ssl.c ext/session/session.c ext/simp

2013-08-14 Thread Christopher Jones 
Commit:39612afc72623e89a2bc595c9be4be497568d1be
Author:Christopher Jones s...@php.net Wed, 14 Aug 2013 20:43:25 
-0700
Parents:   8c61758dc772345636e436e3f69bef7323f8b339 
9ad97cd48903ea5454853960f2c14de326e0f624
Branches:  PHP-5.5 master

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

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

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

Conflicts:
ext/dba/libinifile/inifile.c

Changed paths:
  MM  ext/date/php_date.c
  MM  ext/intl/resourcebundle/resourcebundle_class.c
  MM  ext/openssl/openssl.c
  MM  ext/openssl/xp_ssl.c
  MM  ext/session/session.c
  MM  ext/simplexml/simplexml.c
  MM  ext/snmp/snmp.c
  MM  ext/spl/spl_array.c
  MM  ext/spl/spl_dllist.c
  MM  ext/standard/array.c
  MM  ext/standard/string.c
  MM  ext/zip/php_zip.c
  MM  main/php_variables.c
  MM  main/rfc1867.c
  MM  sapi/cli/php_cli_server.c


Diff:
diff --cc ext/openssl/openssl.c
index 05e1e79,68be86f..4c3b2ec
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@@ -588,10 -575,10 +588,10 @@@ static void add_assoc_name_entry(zval 
} else {
subitem = val;
}
 -
 +  
for (i = 0; i  X509_NAME_entry_count(name); i++) {
unsigned char *to_add;
-   int to_add_len;
+   int to_add_len = 0;
  
  
ne  = X509_NAME_get_entry(name, i);


--
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/date/php_date.c

2013-01-06 Thread Derick Rethans 
Commit:4ff088d061ed3d4e15d38d0ed3f2fd10346c634c
Author:Derick Rethans git...@derickrethans.nl Sun, 6 Jan 2013 
15:07:25 +
Parents:   9934efff5fa174b3ae87f3e6295a2fe48f7ebd6f 
ba35ae32b7e9858e6590a616c4d5c2f0020cc7ab
Branches:  PHP-5.5 master

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

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

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c

2012-12-05 Thread Dmitry Stogov 
Commit:bc7857169a57e1e104c390972fe206c504f601d9
Author:Dmitry Stogov dmi...@zend.com Wed, 5 Dec 2012 17:59:46 
+0400
Parents:   274ceb3d8de122e05910b1c9906634be8495beb4 
df97c3aa0d331be668bd5d8f27fff96d4e3ac1d7
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Use get_gc instead of hacks of get_properties

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c

2012-12-04 Thread Stanislav Malyshev 
Commit:1c8f106d9a65a29a29c68a9cde02c03e8dd6cac5
Author:Stanislav Malyshev s...@php.net Tue, 4 Dec 2012 21:02:55 
-0800
Parents:   86bf83dcf2dcb4a8b89519997765d2b0674247f9 
fd650ec93e15bbbc05542e4acdde13d1fd9bcf73
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  fix bug #63666 - Poor date() performance

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

Changed paths:
  MM  ext/date/php_date.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/date/php_date.c

2012-12-01 Thread Remi Collet 
Commit:50fec2bae2996ec7c77cab68b34fe06a02db4816
Author:Remi Collet r...@php.net Sat, 1 Dec 2012 10:26:32 +0100
Parents:   5db372fbdc30005d831d1ef197aeb6a553177197 
7552a7eb191b477349fa278e50fa8b3858382535
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond

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

Changed paths:
  MM  ext/date/php_date.c


Diff:



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