archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
85640 commits 526 branches 1434 tags 865 MiB
Commit graph

749 commits

Author SHA1 Message Date
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
Anatol Belski
d2161c8104 reveal some newer libcurl features in MINFO 2014-10-03 21:47:00 +02: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
Nikita Popov
28e7beea66 Fix zend_longo_str 2014-08-25 22:47:04 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
6f9f0bf205 master renames phase 2 2014-08-25 19:28:33 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
3bcb168662 ported ext/curl 2014-08-19 11:24:24 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Nikita Popov
3f27d707d2 Use zend_long_to_str in curl 
Also use STR_ADDREF instead of maintaining a numeric_key flag.
 2014-05-28 18:34:35 +02:00
Dmitry Stogov
066ea2204e Avoid in-place modification 2014-05-28 10:15:15 +04:00
Dmitry Stogov
55b6fb1656 Fixed zend_string/char* mess 2014-05-15 13:44:13 +04:00
Dmitry Stogov
3ba4f8263d Fixed curl_close() behavior 2014-05-13 16:00:44 +04:00
Dmitry Stogov
7fcd4064c0 Merge branch 'master' into phpng 
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
 2014-05-13 15:24:40 +04:00
Dmitry Stogov
b8b8c497c4 In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter. 2014-05-13 13:18:00 +04:00
Stanislav Malyshev
2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
 2014-05-12 10:56:03 -07:00
Stanislav Malyshev
e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test - output can be chunked
 2014-05-12 10:54:34 -07:00
Stanislav Malyshev
6ef8e0f088 fix test - output can be chunked 2014-05-12 10:54:16 -07:00
Stanislav Malyshev
9c27063a65 fix test 2014-05-12 01:27:18 -07:00
Stanislav Malyshev
89798f57d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve CURL tests to allow testing without separate server
 2014-05-11 23:03:21 -07:00
Stanislav Malyshev
c507c9f01b improve CURL tests to allow testing without separate server 2014-05-11 22:43:08 -07:00
Xinchen Hui
1071bf74cf Finish ext/curl (7 tests fails as trunk) 2014-05-09 14:58:07 +08:00
Xinchen Hui
f4c105dc7d Fixed post data (long type cast matters here :<) 2014-05-09 14:48:39 +08:00
Xinchen Hui
763cee63ab Use zend_string for better performance 2014-05-09 14:14:09 +08:00
Xinchen Hui
2d9bc88db8 Fixed clone refcount 2014-05-09 14:00:47 +08:00
Xinchen Hui
564db38dc4 Fixed build with high version libcurl 2014-05-09 13:54:42 +08:00
Xinchen Hui
c5e63f8a63 Refactoring ext/curl (only compilable now) 2014-05-09 12:17:39 +08:00