clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,835 Commits 494 Branches 1,367 Tags 807 MiB
298e9d2932
Commit Graph

69835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Soria Parra
4f81b4c649 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Use the NEWS merge driver if available
 2012-03-21 18:12:16 +01:00
David Soria Parra
ca797ca31e Use the NEWS merge driver if available 
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it.  This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
 2012-03-21 18:11:41 +01:00
Gustavo André dos Santos Lopes
65a97bec88 Merge branch '5.4' 2012-03-21 13:15:52 +00:00
Gustavo André dos Santos Lopes
54f0d50d3e Made some SplFileObject::fputcsv not pollute the working dir. 2012-03-21 13:13:17 +00:00
Dmitry Stogov
09e367dbaf Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-03-21 16:51:24 +04:00
Dmitry Stogov
41fc30a2d9 Merge branch 'master' of git.php.net:php-src 2012-03-21 16:50:59 +04:00
Dmitry Stogov
d080396908 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
	NEWS
 2012-03-21 16:49:49 +04:00
Gustavo André dos Santos Lopes
a19dba56d2 Merge branch '5.4' 
Conflicts:
	NEWS
 2012-03-21 12:43:51 +00:00
Gustavo André dos Santos Lopes
0f001703a8 Fixed bug #61453. 
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
 2012-03-21 12:42:09 +00:00
Dmitry Stogov
a8cc0b05b4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
	NEWS
	ext/soap/php_sdl.c
 2012-03-21 16:42:08 +04:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04:00
David Soria Parra
abf5ed4d1b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Always keep the NEWS file from the branch when merging
 2012-03-21 12:41:45 +01:00
David Soria Parra
1e18f11c9a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Always keep the NEWS file from the branch when merging
 2012-03-21 12:41:40 +01:00
David Soria Parra
944e622821 Always keep the NEWS file from the branch when merging 
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
 2012-03-21 12:38:43 +01:00
David Soria Parra
443e3b4c93 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61461 (missing checks around malloc() calls).

Conflicts:
	NEWS
 2012-03-21 12:15:33 +01:00
David Soria Parra
f3f0ced4bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664

Conflicts:
	NEWS
 2012-03-21 12:14:35 +01:00
David Soria Parra
c33aeb7d06 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
 2012-03-21 12:10:03 +01:00
David Soria Parra
28bce7618a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664
  adapt makedist to git

Conflicts:
	NEWS
 2012-03-21 12:09:53 +01:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Pierre Joye
363a3218e2 - revert test commit 2012-03-21 08:30:33 +01:00
Pierre Joye
d11f4eddcc - test commit for log mail 2012-03-21 07:34:46 +01:00
Pierre Joye
fda25d97ff - update NEWS 2012-03-21 07:06:07 +01:00
Pierre Joye
baeaafd395 - add test for bug #55000 and #54374 2012-03-21 07:00:22 +01:00
Pierre Joye
95dcd799fb - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664 2012-03-21 06:58:55 +01:00
Ilia Alshanetsky
9dcfb8c73f Fixed bug #61461 (missing checks around malloc() calls). 2012-03-20 21:07:08 -04:00
Stanislav Malyshev
2288e0eed1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  adapt makedist to git
 2012-03-20 10:02:38 -07:00
Stanislav Malyshev
f3f76e5e8a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  adapt makedist to git
 2012-03-20 10:02:22 -07:00
Stanislav Malyshev
cb4e82a1cc adapt makedist to git 2012-03-20 10:02:00 -07:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4' 
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
 2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4 
* 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
 2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
David Soria Parra
eb8812e58b Enable $Id$ expansion for files with the $Revision$ keyword 
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
 2012-03-20 17:49:42 +01:00
David Soria Parra
1dcb81c14c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Adding Braces in json.c to conform with coding standards
 2012-03-20 17:31:29 +01:00
David Soria Parra
71d894cd42 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Adding Braces in json.c to conform with coding standards
 2012-03-20 17:29:20 +01:00
Matt Nowack
76ef76d2f8 Adding Braces in json.c to conform with coding standards 2012-03-20 17:29:04 +01:00
Martin Jansen
a0c87ff53c Merge branch 'master' of git.php.net:php-src 2012-03-20 11:16:09 +01:00
Martin Jansen
0119f24df1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Bump copyright year.
 2012-03-20 11:15:36 +01:00
Martin Jansen
c337f69157 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bump copyright year.
 2012-03-20 11:15:28 +01:00
Martin Jansen
52ec6f761e Bump copyright year. 
Bug #61386
 2012-03-20 11:14:59 +01:00
Xinchen Hui
ac38f4e113 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Ignore the temporay files in sapi/*/tests/
 2012-03-20 17:22:03 +08:00
Xinchen Hui
14ccdd1b55 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Ignore the temporay files in sapi/*/tests/
 2012-03-20 17:21:35 +08:00
Xinchen Hui
7aa2b75db2 Ignore the temporay files in sapi/*/tests/ 2012-03-20 17:20:15 +08:00
Xinchen Hui
4b6772f847 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Ignore the temporay files in sapi/*/tests/
 2012-03-20 16:00:21 +08:00
Xinchen Hui
868dbe127a Ignore the temporay files in sapi/*/tests/ 2012-03-20 15:59:17 +08:00
Xinchen Hui
1a42558832 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Minor change, test using php mail address as account
 2012-03-20 15:42:25 +08:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00
Xinchen Hui
a0d149bc50 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Use newdoc instead of escape char
  adapt makedist to git
 2012-03-20 15:27:41 +08:00
Xinchen Hui
30bd2494a2 Use newdoc instead of escape char 2012-03-20 15:26:58 +08:00
Stanislav Malyshev
44d948996f adapt makedist to git 2012-03-19 22:28:16 -07:00
Christopher Jones
eda790de0f Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
 2012-03-19 15:25:27 -07:00