archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
103071 commits 526 branches 1434 tags 873 MiB
Commit graph

937 commits

Author SHA1 Message Date
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
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
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
Daniel Lowrey
a031dc06d9 Add openssl.cafile ini check when loading cainfo 2014-02-25 09:59:13 -07:00
Anatol Belski
5180425ca9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
 2014-02-05 15:17:30 +01:00
Anatol Belski
fd87b38c47 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  adapt test to curl 7.35.0 upgrade
 2014-02-05 15:16:57 +01:00
Anatol Belski
71ebc0a7f3 adapt test to curl 7.35.0 upgrade 
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
 2014-02-05 15:15:34 +01:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Adam Harvey
fba290c061 Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir. 
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.

Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
 2013-09-10 11:42:42 -07:00
Christopher Jones
54d4a28003 Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]" 2013-08-21 15:39:14 -07:00
Christopher Jones
19476f51f2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
 2013-08-19 17:18:28 -07:00
Christopher Jones
d5979c88ea Reduce (some more) compile noise of 'unused variable' and 'may be used 
uninitialized' warnings.
 2013-08-19 17:17:54 -07:00
Adam Harvey
2a46fc0470 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:19:13 -07:00
Adam Harvey
69f12ad582 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
 2013-08-19 12:16:36 -07:00
Adam Harvey
aa7d3d8e6d Track created curl_slist structs by option so they can be updated in situ. 
At present, when curl_setopt() is called with an option that requires the
creation of a curl_slist, we simply push the new curl_slist onto a list to be
freed when the curl handle is freed. This avoids a memory leak, but means that
repeated calls to curl_setopt() on the same handle with the same option wastes
previously allocated memory on curl_slist structs that will no longer be read.

This commit changes the zend_llist that was previously used to track the lists
to a HashTable keyed by the option number, which means that we can simply
update the hash table each time curl_setopt() is called.

Fixes bug #65458 (curl memory leak).
 2013-08-19 12:01:04 -07:00
Christopher Jones
4c3c9d1fe5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Felipe Pena
802a25e0c9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed typo on condition
 2013-06-25 21:53:42 -03:00
Felipe Pena
623386d799 - Fixed typo on condition 2013-06-25 21:53:20 -03:00
David Soria Parra
e04baf692a Fix curl build on windows 2013-04-25 08:04:30 +02:00
David Soria Parra
4c0746228d Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for RC1
  NEWS for PHP 5.5.0 Beta 4 again
  Fix curl build on windows
 2013-04-25 08:25:10 +02:00
Pierrick Charron
74394733ed Merge branch 'PHP-5.5' 
* PHP-5.5:
  Remove curl wrappers
 2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268 Remove curl wrappers 2013-04-23 17:01:17 -04:00
Anatol Belski
cd3dc3308b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added curl config test for windows
 2013-04-17 14:26:26 +02:00
Anatol Belski
2d9cbf720d Added curl config test for windows 2013-04-17 14:25:45 +02:00
Xinchen Hui
2794d455ea Merge branch 'PHP-5.5' 2013-04-04 19:31:21 +08:00
Xinchen Hui
01ca2bf8c3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, 2013-04-04 19:28:17 +08:00
Xinchen Hui
bd6a90dac7 Merge branch 'PHP-5.5' 2013-04-03 10:17:49 +08:00
Xinchen Hui
6ace9c646b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-03 10:15:41 +08:00
Xinchen Hui
d7f709a032 Add CURL_WRAPPERS_ENABLE constant 
see http://news.php.net/php.internals/66871
 2013-04-03 10:09:51 +08:00
Anatol Belski
15a182a2d0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix the test for curl 7.29.0+
 2013-02-19 09:05:45 +01:00
Anatol Belski
43664e656d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the test for curl 7.29.0+
 2013-02-19 09:05:27 +01:00
Anatol Belski
cc34dfce16 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix the test for curl 7.29.0+
 2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65 fix the test for curl 7.29.0+ 2013-02-19 09:04:06 +01:00
Stanislav Malyshev
c389d33f0c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix protos
 2013-02-17 13:34:07 -08:00
Stanislav Malyshev
17c6389e9e fix protos 2013-02-17 13:33:48 -08:00
Anatol Belski
9a85dca7a5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix free vs. curl_free
 2013-02-17 20:29:58 +01:00
Anatol Belski
432d59ab55 fix free vs. curl_free 2013-02-17 20:29:20 +01:00
Xinchen Hui
34381de5f3 Merge branch 'PHP-5.5' 2013-02-04 14:22:17 +08:00
Xinchen Hui
53159f6e05 implicit declaration of zend_throw_exception 2013-02-04 14:20:50 +08:00
Stanislav Malyshev
7ae80c585f Merge branch 'PHP-5.5' 
* PHP-5.5:
  forgot this file :(
 2013-01-29 15:03:19 -08:00
Stanislav Malyshev
15e76e6a98 forgot this file :( 2013-01-29 15:02:55 -08:00
Stanislav Malyshev
24447dca5d post-5.5 changes for bug #46439 as described in the RFC 2013-01-28 22:26:59 -08:00
Stanislav Malyshev
a9d013bb02 Implement fix for bug #46439 - add CURLFile class for safer uploads 2013-01-28 22:22:59 -08:00