| #
381fd62c |
| 05-Dec-2014 |
Adam Harvey |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert unintentional docblock change
|
| #
79131b46 |
| 05-Dec-2014 |
Adam Harvey |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert unintentional docblock change
|
| #
0e985d37 |
| 05-Dec-2014 |
Chris Christoff |
Revert unintentional docblock change
Revert unintentional docblock change
It looks like commit dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change.
Revert unintentional docblock change
Revert unintentional docblock change
It looks like commit dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change. I have reverted this
change in this commit.
show more ...
|
| #
2a8f7f88 |
| 17-Oct-2014 |
Rasmus Lerdorf |
Merge branch 'PHP-5.6'
* PHP-5.6:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
|
| #
56064666 |
| 17-Oct-2014 |
Rasmus Lerdorf |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
|
| #
2b5bffe6 |
| 17-Oct-2014 |
Rasmus Lerdorf |
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247 |
| #
01d17228 |
| 14-Oct-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix return code (merges are hard :( )
|
| #
47a1447c |
| 14-Oct-2014 |
Stanislav Malyshev |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix return code (merges are hard :( )
|
| #
bb3d43fa |
| 14-Oct-2014 |
Stanislav Malyshev |
Fix return code (merges are hard :( ) |
| #
d9559d0e |
| 14-Oct-2014 |
Stanislav Malyshev |
fix bad merge |
| #
81b67937 |
| 29-Sep-2014 |
Stanislav Malyshev |
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c |
| #
71b63fc7 |
| 29-Sep-2014 |
Stanislav Malyshev |
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c |
| #
d1e030db |
| 29-Sep-2014 |
Stanislav Malyshev |
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c |
| #
ab0939e5 |
| 29-Sep-2014 |
Stanislav Malyshev |
Fix bug #68089 - do not accept options with embedded \0
Conflicts:
ext/curl/interface.c |
| #
d2161c81 |
| 03-Oct-2014 |
Anatol Belski |
reveal some newer libcurl features in MINFO |
| #
e33f3d3b |
| 20-Sep-2014 |
Nikita Popov |
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 m
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.
show more ...
|
| #
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
| #
635a2312 |
| 14-Sep-2014 |
Anatol Belski |
better way to check for empty string |
| #
95a50f73 |
| 12-Sep-2014 |
Anatol Belski |
fix type |
| #
8002e2c0 |
| 05-Sep-2014 |
Xinchen Hui |
Fixed discards qualifiers from pointer target type |
| #
32344808 |
| 27-Aug-2014 |
Anatol Belski |
first show to make 's' work with size_t |
| #
202e8db1 |
| 26-Aug-2014 |
Anatol Belski |
fixed several long vs zend_long casts |
| #
28e7beea |
| 25-Aug-2014 |
Nikita Popov |
Fix zend_longo_str |
| #
af59e92b |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 7 |
| #
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1 |
