php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-09 09:03:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
68,007 Commits 547 Branches 1,483 Tags
ee755fafb99ba618fd82bbe05758ace68584ded1
Commit Graph

68007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
ee755fafb9 update for git 2012-03-22 20:04:22 -07:00
Christopher Jones
22f4043a38 Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4 
* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  - 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-22 11:34:25 -07:00
Ilia Alshanetsky
f9f631fb76 Fixed bug #61423 (gzip compression fails). 
Conflicts:

	NEWS
 2012-03-22 09:46:33 -04:00
Ilia Alshanetsky
2630bc6e5f BFN 2012-03-22 09:15:40 -04:00
Ilia Alshanetsky
30f6a9ba48 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
 2012-03-22 09:15:17 -04:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Dmitry Stogov
3f9c3ad288 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Revert "Fixed reference counting"
  Fixed reference counting
 2012-03-22 16:40:15 +04:00
Dmitry Stogov
dd33437eee Revert "Fixed reference counting" 
This reverts commit 752fec88ef.
 2012-03-22 15:52:32 +04:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting" 
This reverts commit 14af1fe692.
 2012-03-22 15:51:58 +04:00
David Soria Parra
b60f9fe146 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed reference counting
 2012-03-22 12:13:52 +01:00
David Soria Parra
0b646e8027 Revert "Fixed reference counting" 
This reverts commit 752fec88ef.
 2012-03-22 12:13:31 +01:00
Dmitry Stogov
752fec88ef Fixed reference counting 2012-03-22 15:03:38 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Xinchen Hui
df129ae7ea Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, and merge the modification from trunk
 2012-03-22 17:31:15 +08:00
Xinchen Hui
523396cb28 Fix test, and merge the modification from trunk 2012-03-22 17:30:16 +08:00
Xinchen Hui
8254e21a68 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Ignore the tempoary files
 2012-03-22 17:22:47 +08:00
Xinchen Hui
27208de763 Ignore the tempoary files 2012-03-22 17:22:17 +08:00
Xinchen Hui
2dbced096a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, which was broken by the fix for #61173

Conflicts:
	ext/fileinfo/tests/finfo_open_error.phpt
 2012-03-22 17:17:42 +08:00
Xinchen Hui
e96a172114 Fix test, which was broken by the fix for #61173 2012-03-22 17:10:03 +08:00
Christopher Jones
ab825fdc24 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 
* 'PHP-5.3' of ../php-5.3:
  Add initialization tests for SQLT_INT binds
 2012-03-21 16:14:51 -07:00
Christopher Jones
fe5785d92b Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-21 16:12:28 -07:00
Gustavo André dos Santos Lopes
c0e9767131 Merge branch '5.3' into 5.4 (just to sync, no code changes) 2012-03-21 21:31:58 +00:00
Gustavo André dos Santos Lopes
cdc5d4a801 Merge branch 'PHP-5.3' of git.php.net:/php-src into 5.3 2012-03-21 21:13:35 +00:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
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
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
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
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
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
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
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
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
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
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
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
868dbe127a Ignore the temporay files in sapi/*/tests/ 2012-03-20 15:59:17 +08:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00