clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,315 Commits 491 Branches 1,363 Tags 841 MiB
29688512b4
Commit Graph

775 Commits

Author SHA1 Message Date
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Xinchen Hui
124fb22a13 Fixed bug #68739 #68740 #68741 2015-01-08 16:09:02 +08:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
3b6a8b1163 remove the thread ctx from curl 2014-12-17 11:38:46 +01:00
Anatol Belski
4acc56d5b2 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix unserializer patch
  move this entry to the correct version
  add missing NEWS entry
  add missing NEWS entry
  Updated or skipped certain 32-bit tests
  add NEWS entry for #68594
  5.4.37
  add more BC breaks
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
  Fix typo
  Hash value must not zero?
 2014-12-17 05:29:36 +01:00
Andrea Faulds
1392102b0c Updated or skipped certain 32-bit tests 2014-12-17 01:06:48 +00:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Adam Harvey
751aa92fe5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert unintentional docblock change
 2014-12-05 13:58:48 -08:00
Adam Harvey
381fd62ccf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert unintentional docblock change
 2014-12-05 13:58:19 -08:00
Adam Harvey
79131b4617 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert unintentional docblock change
 2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726 Revert unintentional docblock change 
Revert unintentional docblock change

It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
 2014-12-05 13:57:03 -08:00
Stanislav Malyshev
8b2a8c46b0 Merge branch 'pull-request/728' 
* pull-request/728:
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)

Conflicts:
	ext/curl/multi.c
 2014-11-30 22:22:15 -08:00
Stanislav Malyshev
e0b6e5222b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
 2014-11-30 22:22:01 -08:00
Jille Timmermans
1b4368db77 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-30 22:18:22 -08:00
Jille Timmermans
7049d3450e Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set) 2014-11-30 22:18:12 -08:00
Jille Timmermans
00c6033f99 Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) 2014-11-24 09:37:55 +01:00
Stanislav Malyshev
f782d6710d Merge branch 'PHP-5.6' 
* PHP-5.6:
  test to function addcslashes
  test
  Test PHP Init Fail Without Params
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
 2014-11-23 17:26:35 -08:00
Stanislav Malyshev
2c67c0246e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Test PHP Init Fail Without Params
 2014-11-23 17:21:29 -08:00
Stanislav Malyshev
fa76fa8e32 Merge branch 'pull-request/863' into PHP-5.5 
* pull-request/863:
  Test PHP Init Fail Without Params
 2014-11-23 17:21:20 -08:00
Anatol Belski
4b8cc567cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix dir separator in test
 2014-11-05 15:43:37 +01:00
Anatol Belski
d4050f42fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6 fix dir separator in test 2014-11-05 15:42:45 +01:00
Rasmus Lerdorf
2a8f7f8824 Merge branch 'PHP-5.6' 
* PHP-5.6:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:49 -07:00
Rasmus Lerdorf
5606466624 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
 2014-10-16 21:28:20 -07:00
Rasmus Lerdorf
2b5bffe6c7 TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 2014-10-16 21:25:29 -07:00
Stanislav Malyshev
01d17228dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix return code (merges are hard :( )
 2014-10-14 11:45:01 -07:00
Stanislav Malyshev
47a1447cc8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix return code (merges are hard :( )
 2014-10-14 11:43:34 -07:00
Stanislav Malyshev
bb3d43fa05 Fix return code (merges are hard :( ) 2014-10-14 11:42:33 -07:00
Stanislav Malyshev
d9559d0ecd fix bad merge 2014-10-14 11:17:48 -07:00
Stanislav Malyshev
81b67937e4 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:51:46 -07:00
Stanislav Malyshev
71b63fc701 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:45:35 -07:00
Stanislav Malyshev
d1e030db02 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-14 10:43:59 -07:00
Stanislav Malyshev
ab0939e5e5 Fix bug #68089 - do not accept options with embedded \0 
Conflicts:
	ext/curl/interface.c
 2014-10-13 23:16:06 -07:00
Anatol Belski
d2161c8104 reveal some newer libcurl features in MINFO 2014-10-03 21:47:00 +02:00
Paulo Eduardo
17759439d7 Test PHP Init Fail Without Params 2014-09-30 08:56:46 -03:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Nikita Popov
a770d29df7 Add smart_str_append for appending zend_strings 
Also replaces usages in Zend/ and ext/standard
 2014-09-21 20:58:31 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
635a23128b better way to check for empty string 2014-09-14 22:07:38 +02:00
Anatol Belski
95a50f7322 fix type 2014-09-12 21:35:23 +02:00
Anatol Belski
0292c34b05 Merge branch 'PHP-5.6' 
* PHP-5.6:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
  5.6.2 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-11 23:33:12 +02:00
Anatol Belski
13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
 2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Xinchen Hui
8002e2c06a Fixed discards qualifiers from pointer target type 2014-09-05 09:31:05 +08:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00