php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 01:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,685 Commits 549 Branches 1,485 Tags
eff60f993ccc9d9bbf0e2c2da12c124578be2bf9
Commit Graph

31396 Commits

Author SHA1 Message Date
Boris Lytochkin eff60f993c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
 2013-05-03 23:10:11 +04:00
Boris Lytochkin c34274acb8 re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore 
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
 2013-05-03 23:06:34 +04:00
Boris Lytochkin 1c8befe893 cut PHP_VERSION_ID - we know API version now 2013-05-03 19:22:21 +04:00
Anatol Belski 6d41711fd9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:04:53 +02:00
Anatol Belski aa4762572e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64770 stream_select() fails with pipes
 2013-05-03 17:03:16 +02:00
Anatol Belski b1ea0b7a7a Fixed bug #64770 stream_select() fails with pipes 
returned by proc_open() on Windows x64
 2013-05-03 17:01:33 +02:00
Boris Lytochkin c68f9d5503 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64159 (Truncated snmpget)
 2013-05-03 15:39:57 +04:00
Boris Lytochkin e36adfe94a Fixed bug #64159 (Truncated snmpget) 2013-05-03 15:35:09 +04:00
Boris Lytochkin 1ce836580d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)
 2013-05-03 12:19:10 +04:00
Boris Lytochkin 3828f6227b Fix bug #64765 (enclose IPv6 address into square brackets) 2013-05-03 12:13:50 +04:00
Johannes Schlüter 062519ed41 don't include smart_str.h in a too global header, fixes #64718 2013-04-30 14:26:55 +02:00
Dmitry Stogov 13de57c0f4 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
 2013-04-30 10:27:24 +04:00
Dmitry Stogov c782cf7fb3 Added SoapClient constructor option 'ssl_method' to specify ssl method 2013-04-30 10:24:49 +04:00
Pierre Joye 83682d8833 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-30 08:01:52 +02:00
Pierre Joye 1a335d20a8 fix #64738, fix implicit type declaration 2013-04-30 07:52:40 +02:00
Dmitry Stogov 4b83f4a011 Avoid possible conditional jump depended on uninitialised value 2013-04-29 10:45:31 +04:00
Dmitry Stogov a5b4eeb5f0 Fixed compilation warnings (issue #92) 2013-04-29 10:32:08 +04:00
Stanislav Malyshev 4e773c1b92 Revert "Add CURL_WRAPPERS_ENABLE constant" 
This reverts commit d7f709a032.
Since wrappers are deleted from 5.5, no point in adding this constant.
 2013-04-28 22:26:05 -07:00
Pierre Joye 9877773438 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-27 18:00:02 +02:00
Pierre Joye 25c9f34c9c fix #64725, wrong res check 2013-04-27 17:52:30 +02:00
Xinchen Hui e60638faca Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:50:23 +08:00
Xinchen Hui 7b9eabaf51 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:50:02 +08:00
Xinchen Hui 15b554cd9b Also fixed bug #64726 in 5.3 2013-04-27 23:49:43 +08:00
Xinchen Hui 1c07590ed7 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-27 23:41:51 +08:00
Xinchen Hui 8f5a534b21 Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB pointer has closed) 2013-04-27 23:41:31 +08:00
Xinchen Hui d54432ed98 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-27 23:38:10 +08:00
Xinchen Hui c7b8368ed5 Fix memory realted to #64726 2013-04-27 23:38:00 +08:00
Anatol Belski ca148c030f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2013-04-27 14:09:55 +02:00
Anatol Belski e9b03c412b updated libmagic.patch 2013-04-27 14:09:29 +02:00
Anatol Belski d72307f1ca Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug bug #64713 Compilation warnings in finfo
 2013-04-27 13:51:12 +02:00
Anatol Belski cdc1a63790 Fixed bug bug #64713 Compilation warnings in finfo 2013-04-27 13:49:50 +02:00
David Soria Parra cf5d7d9e73 Fix implicit declaration warning for cdf_timestamp_to_timespec 2013-04-26 12:28:58 +02:00
David Soria Parra b86c85723e Fix #64711 ("value computed but not used" in parse_date.c) 2013-04-26 11:33:54 +02:00
David Soria Parra 75cec90d8c Fix #64712 (Obsolete declarations in php_date.c) 2013-04-26 10:45:08 +02:00
Pierre Joye 2809afa119 - #64710, check return val 2013-04-26 08:15:33 +02:00
Pierre Joye 7bd20354a8 - #64710, kill unused var 2013-04-26 08:15:05 +02:00
Pierre Joye b0afef2d5e #64710, kill unused vars 2013-04-26 08:10:24 +02:00
Pierre Joye 685a6d9aab #64710, kill unused vars 2013-04-26 08:09:19 +02:00
Pierre Joye 7b06189702 #64710, kill unused vars 2013-04-26 08:08:38 +02:00
Pierre Joye 3fffc78ed0 #64710, kill unused vars 2013-04-26 08:07:47 +02:00
Pierre Joye b5902b6c9d #64710, kill unused vars 2013-04-26 08:06:34 +02:00
Pierre Joye afe46d4d47 #64710, Implicit declaration 2013-04-26 07:48:11 +02:00
Matt Ficken 7d0dd957eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix Test Bug #64714
 2013-04-25 11:37:25 -07:00
Matt Ficken 5adf1be45d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix Test Bug #64714
 2013-04-25 11:37:09 -07:00
Matt Ficken bf5506f511 Fix Test Bug #64714 2013-04-25 11:34:57 -07:00
David Soria Parra e04baf692a Fix curl build on windows 2013-04-25 08:04:30 +02:00
Remi Collet 182fef46a9 Fixed bug #64707 missing declaration after dd0399f 2013-04-25 06:40:55 +02:00
Remi Collet 26bd2cba81 gd: missing headers in previous 2013-04-24 16:15:42 +02:00
Remi Collet 3a8ceed844 allow use of gdImageCreateFromJpegEx with system libgd 2013-04-24 16:15:11 +02:00
Remi Collet dd0399f5c6 We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex 
The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
 2013-04-24 16:07:50 +02:00