mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-24 09:18:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
78,435 Commits 503 Branches 1,387 Tags 845 MiB
cf90bd92bf
Commit Graph

78435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
cf90bd92bf support for static analyzers other than visual studio 2014-03-01 20:15:10 +01:00
Anatol Belski
0bbacd8678 fix wording 2014-03-01 13:28:02 +01:00
Anatol Belski
db9d911093 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-01 13:16:16 +01:00
Anatol Belski
7c60a09cae reveal more info on the configure options 2014-03-01 13:11:35 +01:00
Tjerk Meesters
6b6b2149af Updated news for #66535 and #66109 2014-03-01 12:27:36 +08:00
Anatol Belski
af545ead97 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  don't compare constants on run time
 2014-02-28 19:39:34 +01:00
Anatol Belski
36c445970e don't compare constants on run time 2014-02-28 19:38:32 +01:00
Tjerk Meesters
e424049840 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  substr_compare(): Allow zero length comparison
 2014-02-28 23:48:34 +08:00
datibbaw
2e459be237 substr_compare(): Allow zero length comparison 
Treat zero length comparison as always equal.
 2014-02-28 23:45:04 +08:00
Tjerk Meesters
43ac0ab673 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
 2014-02-28 22:31:16 +08:00
Tjerk Meesters
d022c8565d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
 2014-02-28 22:30:21 +08:00
Tjerk Meesters
eca13f7909 Fixed test case title 2014-02-28 22:27:32 +08:00
Tjerk Meesters
79b3c2a744 [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given 
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.
 2014-02-28 22:22:07 +08:00
Tjerk Meesters
cbb2dc0788 Merge branch '5.5' into 5.6 
* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
 2014-02-28 19:01:17 +08:00
Tjerk Meesters
9443fb999d Fixed expected output of a few cURL test cases 2014-02-28 18:59:06 +08:00
datibbaw
488e64dbe4 Allow NULL as value for CURLOPT_CUSTOMREQUEST option. 
Added test case.

Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE.

Removed unused error variable.

Indentation fix.
Removed the ugly goto.
 2014-02-28 18:27:22 +08:00
Anatol Belski
1cb4398ac1 primitive test fixes 2014-02-28 09:43:57 +01:00
Remi Collet
06feb15a16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:26 +01:00
Remi Collet
5fc7382a57 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:16 +01:00
Remi Collet
b1df743b7a man page: long option name is --strip, not --stripped 2014-02-28 08:12:03 +01:00
Remi Collet
c73b0543f1 --global have be removed in 5.2 2014-02-28 08:10:01 +01:00
Anatol Belski
2c1385b7f5 remove pcntl leftover from the test code 2014-02-27 15:50:17 +01:00
Ferenc Kovacs
5abaf7cc87 list the fpm change hat rfc in UPGRADING 2014-02-27 12:54:07 +01:00
Ferenc Kovacs
8bb84693b3 mention the apparmor support in fpm 2014-02-27 12:43:42 +01:00
Ferenc Kovacs
bfbdc032b6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typo spotted by Lajos Veres
 2014-02-27 11:30:23 +01:00
Ferenc Kovacs
561843c973 typo spotted by Lajos Veres 2014-02-27 11:29:08 +01:00
Anatol Belski
703154321f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update libs_version.txt

Conflicts:
	win32/build/libs_version.txt
 2014-02-27 09:26:48 +01:00
Anatol Belski
603ebc70ff update libs_version.txt 2014-02-27 09:25:15 +01:00
Anatol Belski
ccd4bf5147 update libs_version.txt 2014-02-27 09:23:48 +01:00
Remi Collet
6ed83d37af NEWS 2014-02-27 08:50:29 +01:00
Remi Collet
fa01db3466 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
 2014-02-27 08:50:07 +01:00
Remi Collet
cb0e6124d4 NEWS 2014-02-27 08:49:56 +01:00
Remi Collet
82e92c99a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
 2014-02-27 08:49:33 +01:00
Remi Collet
33d372a45f NEWS 2014-02-27 08:49:08 +01:00
Remi Collet
816a5d2072 test for bug #66762 2014-02-27 08:48:01 +01:00
Remi Collet
9137acc7ec Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed 
Each new mysqli_stmt now increase the refcount of the link object.
So the link is really destroy after all statements.

Only implemented with libmysqlclient, as mysqlnd already implement
this internally.

So, libmysqlclient and mysqlnd have the same behavior.
 2014-02-27 08:45:16 +01:00
Ferenc Kovacs
42a43d4531 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests broken by 633f898f15
 2014-02-27 02:32:47 +01:00
Ferenc Kovacs
fd20278fa5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix tests broken by 633f898f15
 2014-02-27 02:32:07 +01:00
Ferenc Kovacs
bd961f3e87 fix tests broken by 633f898f15 2014-02-27 02:31:42 +01:00
Ferenc Kovacs
afb0675e3b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add missing NEWS entry
 2014-02-27 01:28:57 +01:00
Ferenc Kovacs
1d51c43287 add missing NEWS entry 2014-02-27 01:27:53 +01:00
Ferenc Kovacs
1b8679401c add missing NEWS entry 2014-02-27 01:27:53 +01:00
Ferenc Kovacs
cb9ce48d02 add missing NEWS entry 2014-02-27 01:27:52 +01:00
Ferenc Kovacs
95e0de7cfa add missing NEWS entry 2014-02-27 01:27:52 +01:00
Ferenc Kovacs
b59831bc30 add missing NEWS entry 2014-02-27 01:27:52 +01:00
Ferenc Kovacs
38797e598b add missing NEWS entry 2014-02-27 01:18:11 +01:00
Daniel Lowrey
4b06e0a2d0 Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6 
* 'curlClosePolicy' of https://github.com/DaveRandom/php-src:
  Remove cURL close policy related constants
 2014-02-26 13:40:16 -07:00
Daniel Lowrey
d0a6f8c68e Deprecate CN_match in favor of peer_name in SSL contexts 2014-02-26 13:20:06 -07:00
Chris Wright
afc24da436 Remove cURL close policy related constants 
These options don't do anything and they never have.

Refs:
  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCLOSEPOLICY
  http://curl.haxx.se/mail/lib-2006-11/0301.html
 2014-02-26 17:48:14 +00:00
Nikita Popov
96d0bb7bca Update stack size in tests/func/010.phpt 
Stack size is 16K nowadays. Now the test takes a more reasonable
amount of time to run...
 2014-02-26 16:40:25 +01:00