[PHP-CVS] com php-src: Merge branch 'PHP-5.5': php.ini-development php.ini-production

2013-10-23 Thread Christopher Jones
Commit:b3a2b44198f160aa829c0079012dd8a029fe5f6d
Author:Christopher Jones s...@php.net Mon, 21 Oct 2013 14:21:19 
-0700
Parents:   d15cedfba9bfa99bf4d4f55ebf67ef49adf1d15b 
b6ceea4a25f667bfed6c26899dd55a274a3270d3
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65939 (Space before ; breaks php.ini parsing). (brainstorm at 
nopcode dot org)

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

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-09-09 Thread Adam Harvey
Commit:b8beb657ca725913ab8568eb218691bdd2f838c5
Author:Adam Harvey ahar...@php.net Mon, 9 Sep 2013 16:59:26 -0700
Parents:   2240f9531be40a8d186c47c9f3689c0b72e1a11f 
d209c362d2d59b0ceb82ff300cc868933ae23a06
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Tinker with the wording of the short_open_tag description.

Conflicts:
php.ini-development
php.ini-production

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-08-20 Thread Yasuo Ohgaki
Commit:8da7aa7e4189f0be434b7c936840429302e021b6
Author:Yasuo Ohgaki yohg...@php.net Tue, 20 Aug 2013 18:30:46 
+0900
Parents:   117bd0848a556b09c917bb7511c328ca46f139ca 
4cd9796be78bfb1cc88b5ed71cbd61e56937b8e7
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add session.use_strict_mode description to php.ini-*

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-08-10 Thread Stanislav Malyshev
Commit:0f09b978cc0d149ee54ee154b190b72dc6886be5
Author:Stanislav Malyshev s...@php.net Sat, 10 Aug 2013 17:31:59 
-0700
Parents:   0959475e11e58f69e58352ffe8dc54fc2d003f3c 
143ec706388d3d3dcbfe73e4d14f57c97daa134d
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
  Update NEWS

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-07-21 Thread Stanislav Malyshev
Commit:1a05648e6ddb6af847a34e7adf4bbea45409809c
Author:Stanislav Malyshev s...@php.net Sun, 21 Jul 2013 21:17:59 
-0700
Parents:   02457554a35fbb96fd3f51caf7deab91ca32ecb2 
2c23004a1e3eb14695e6c44e52e4d5fe2a2d37d9
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should 
contain the typo)
  mssql.compatability_mode fix

Conflicts:
configure.in
main/php_version.h

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-07-17 Thread Yasuo Ohgaki
Commit:0a7c4ec4ccf582711729c1799307b0136f2a
Author:Yasuo Ohgaki yohg...@php.net Thu, 18 Jul 2013 14:10:34 
+0900
Parents:   2a13fb106da1973ab4533315444fdafa3638df69 
d6692514f8c7654aa71e4263d42f919dcf62ffa7
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improve php.ini-* documentation

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-07-15 Thread Stanislav Malyshev
Commit:2c8a4af892151f9991345e57d67f27b19b9ff6ef
Author:Stanislav Malyshev s...@php.net Sun, 14 Jul 2013 23:57:16 
-0700
Parents:   50f15bb9219422a0a7e4d86cc03e5d10ed330d85 
8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #62665: add curl.cainfo to php.ini

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

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-04-10 Thread Remi Collet
Commit:ab165d3465b689040f7306f41294db5d73a66076
Author:Remi Collet r...@php.net Thu, 11 Apr 2013 07:06:36 +0200
Parents:   6893a19dbf1ca8f9b269f2bb0109cff745d30e87 
6df1e8d3fe014ea9a3e42a371a16c6f9cd397bbb
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  apply change from opcache readme to php.ini

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-03-27 Thread Dmitry Stogov
Commit:e67e6a1f36836a2ecdfc82ffc29763eba5f9d741
Author:Dmitry Stogov dmi...@zend.com Wed, 27 Mar 2013 21:08:58 
+0400
Parents:   d40174c6bb4e118b287c0e782e5570d55d7f1db3 
26f3ff25fe6d31463c104a034b72fff42b123d5f
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.enable_cli=0

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-03-21 Thread David Soria Parra
Commit:95c3b9ab397339978d7a2f2a196d2fa761410eb2
Author:David Soria Parra d...@php.net Thu, 21 Mar 2013 15:52:12 
+0100
Parents:   9d2897a9d1bacc770d68268407c96f5907860ce1 
293d5defb4eb3962ac6b1ed6620ebc38836e5581
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add OPCache ini settings to php.ini

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


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': php.ini-development php.ini-production

2013-01-28 Thread Stanislav Malyshev
Commit:992bba6aef0ad8063f225dd4c0b77d755133c8e5
Author:Stanislav Malyshev s...@php.net Mon, 28 Jan 2013 22:56:51 
-0800
Parents:   383e3172691d04232ebb74aef8628b8b63da3698 
389d41cc2e32496de2beb05c77f34bfd868c64a0
Branches:  master

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

Log:
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add news for bug #60524
  Implemented Feature #60524 (sys_temp_dir)

Conflicts:
UPGRADING

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

Changed paths:
  MM  php.ini-development
  MM  php.ini-production


Diff:



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