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

2013-03-14 Thread Anatol Belski 
Commit:96388c78c978101a84dc2ccc8b02948f0fb5999f
Author:Anatol Belski  Thu, 14 Mar 2013 14:39:47 +0100
Parents:   dd1c358d1bf8fd492e39d46f93878d47a3b6d257 
5df8cf19759c77ee05fe6eecba7088caecbe132e
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  fix zts check

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

2013-03-04 Thread Anatol Belski 
Commit:2635408a0d2bafe7dbeafab58fa6d046b706bf97
Author:Anatol Belski  Mon, 4 Mar 2013 09:15:17 +0100
Parents:   b65d4d1cfc35af5aa43802501b3b50a81754b657 
4e46a873923b9a608cd2cdcef98ec7faad749d0e
Branches:  PHP-5.5 master

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

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

* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS

Changed paths:
  MM  ext/pcre/php_pcre.c


Diff:



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