<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/php-git.git/sapi/nsapi, branch php-5.6.16</title>
<subtitle>git.php.net: repository/php-src.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/'/>
<entry>
<title>bump year</title>
<updated>2015-01-15T15:26:37+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2015-01-15T15:26:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=0579e8278dad43c7ebc070468b56caddf1c660b8'/>
<id>0579e8278dad43c7ebc070468b56caddf1c660b8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>typo fixes - https://github.com/vlajos/misspell_fixer</title>
<updated>2014-11-23T22:33:43+00:00</updated>
<author>
<name>Veres Lajos</name>
<email>vlajos@gmail.com</email>
</author>
<published>2014-11-20T20:00:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=4dc994571d2def413a83a607885f3e809b60019d'/>
<id>4dc994571d2def413a83a607885f3e809b60019d</id>
<content type='text'>
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
</pre>
</div>
</content>
</entry>
<entry>
<title>Bump year</title>
<updated>2014-01-03T03:08:10+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2014-01-03T03:08:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=c081ce628f0d76d44784d7bb8e06428b06142ac0'/>
<id>c081ce628f0d76d44784d7bb8e06428b06142ac0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Happy New Year</title>
<updated>2013-01-01T08:37:09+00:00</updated>
<author>
<name>Xinchen Hui</name>
<email>laruence@php.net</email>
</author>
<published>2013-01-01T08:37:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=a666285bc2488b7f7362368c388e41428610ad1d'/>
<id>a666285bc2488b7f7362368c388e41428610ad1d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'PHP-5.3' into PHP-5.4</title>
<updated>2012-03-20T16:58:58+00:00</updated>
<author>
<name>David Soria Parra</name>
<email>dsp@php.net</email>
</author>
<published>2012-03-20T16:58:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=c918ca57a7233206ec78ac00438eeb6830e3680b'/>
<id>c918ca57a7233206ec78ac00438eeb6830e3680b</id>
<content type='text'>
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
</pre>
</div>
</content>
</entry>
<entry>
<title>Replace $Revision$ with $Id$ in keyword expansion enable files</title>
<updated>2012-03-20T16:53:47+00:00</updated>
<author>
<name>David Soria Parra</name>
<email>dsp@php.net</email>
</author>
<published>2012-03-20T16:53:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=f7b10abae939412e8b5cab69cd579e071deb446b'/>
<id>f7b10abae939412e8b5cab69cd579e071deb446b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- Year++</title>
<updated>2012-01-01T13:15:04+00:00</updated>
<author>
<name>Felipe Pena</name>
<email>felipe@php.net</email>
</author>
<published>2012-01-01T13:15:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=e4ca0ed09f035b362f48f30b8a2c0fcf47764801'/>
<id>e4ca0ed09f035b362f48f30b8a2c0fcf47764801</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- Year++</title>
<updated>2012-01-01T13:15:04+00:00</updated>
<author>
<name>Felipe Pena</name>
<email>felipe@php.net</email>
</author>
<published>2012-01-01T13:15:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=4e198252811dbf16984cf84ee49d5e93ac642f88'/>
<id>4e198252811dbf16984cf84ee49d5e93ac642f88</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection</title>
<updated>2011-08-18T19:12:49+00:00</updated>
<author>
<name>Uwe Schindler</name>
<email>thetaphi@php.net</email>
</author>
<published>2011-08-18T19:12:49+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=2c0ab6fc33bbe8f5d7c0cb14ff614eab0e297109'/>
<id>2c0ab6fc33bbe8f5d7c0cb14ff614eab0e297109</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bug #55403: Don't set $_SERVER['HTTPS'] on unsecure connection</title>
<updated>2011-08-11T20:25:24+00:00</updated>
<author>
<name>Uwe Schindler</name>
<email>thetaphi@php.net</email>
</author>
<published>2011-08-11T20:25:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/php-git.git/commit/?id=acec8201a1efdac28d12f6495003f45e48ca0106'/>
<id>acec8201a1efdac28d12f6495003f45e48ca0106</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
