Adam Harvey
3253168cde
Remove unnecessary debug warning (that also broke tests).
2015-03-05 00:33:20 +00:00
Adam Harvey
fea9a6fc77
Merge remote-tracking branch 'datibbaw/kill-ereg'
...
Conflicts:
ext/ereg/config.w32
ext/ereg/config0.m4
ext/ereg/ereg.c
ext/ereg/php_ereg.h
ext/ereg/php_regex.h
ext/ereg/regex/engine.c
ext/ereg/regex/main.c
ext/ereg/regex/regcomp.c
ext/ereg/regex/regerror.c
ext/ereg/tests/split_error_002.phpt
ext/ereg/tests/split_variation_003.phpt
ext/ereg/tests/spliti_error_002.phpt
ext/ereg/tests/spliti_variation_003.phpt
ext/pgsql/pgsql.c
sapi/apache/php_apache_http.h
sapi/apache_hooks/php_apache_http.h
2015-03-05 00:21:38 +00:00
Anatol Belski
af3ca74501
made ZEND_TSRMLS_CACHE_* macros look like function calls
...
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Xinchen Hui
e017f35b7f
Merge branch 'PHP-5.6'
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:20:33 +08:00
Xinchen Hui
1db720cd6d
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/pgsql/pgsql.c
2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6
Fixed bug #68638 (pg_update() fails to store infinite values)
2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae
Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5
2015-02-14 22:03:53 +08:00
William Felipe Welter
0421404b73
Fixed bug #68638 pg_update() fails to store infinite values
...
Fix indent
2015-02-12 23:39:54 -02:00
William Felipe Welter
60d5cdf137
Fixed bug #68638 pg_update() fails to store infinite values
...
Check if value is "infinity" with strcasestr() to add quotes
2015-02-09 20:35:18 -02:00
William Felipe Welter
bb3a81c4b4
Fixed bug #68638 pg_update() fails to store infinite values.
...
Add quotes only if "infinity" values are received.
2015-02-07 01:26:12 -02:00
William Felipe Welter
cb3833a3be
Fixed bug #68638 pg_update() fails to store infinite values.
...
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
2015-02-03 22:47:05 -02:00
Xinchen Hui
6c7d3ce09a
Fixed pgsql tests
2015-02-03 23:50:58 +08:00
Xinchen Hui
38829b3b4b
Merge branch 'master' into resource-api
2015-02-03 23:01:48 +08:00
Xinchen Hui
64caa97e02
Fixed test fails
2015-02-03 22:09:37 +08:00
Yasuo Ohgaki
30b4a32e09
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #65199 pg_copy_from() modifies input array variable
Conflicts:
ext/pgsql/pgsql.c
2015-02-03 15:40:59 +09:00
Yasuo Ohgaki
36f73412c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2
Fixed Bug #65199 pg_copy_from() modifies input array variable
2015-02-03 15:26:02 +09:00
Xinchen Hui
0d4255de30
Ported pgsql
2015-02-03 13:51:04 +08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +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
Adam Harvey
2d561e0e26
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Check the return value of lo_export.
2014-12-30 18:01:51 +00:00
Adam Harvey
3ef6e3726c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check the return value of lo_export.
2014-12-30 17:59:39 +00:00
Adam Harvey
211f4ceeae
Check the return value of lo_export.
...
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
2014-12-30 17:47:19 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
3ca0ca1548
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (102 commits)
fix dir separator in test
fix TS build
fix TS build
Better fix for bug #68446
Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
Revert NEWS and set test to XFAIL
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
Improved zend_hash_clean() and added new optimized zend_symtable_clean()
Use inline version of zval_ptr_dtor()
Added new optimized zend_array_destroy() function
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
fix REGISTER_NS_*_CONSTANT macros
Removed useless assert. EG(uninitialized_zval) can't be refcounted.
Use specialized destructors when types of zvals are known.
move tests into proper place
Improved assignment to object property
Reuse zend_assign_to_variable() in zend_std_write_property()
cleanup comments from svn/cvs era
fix dir separator in test
fork test for windows
...
2014-11-26 08:17:35 +01:00
Veres Lajos
06fdf359e3
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d
typo fixes - https://github.com/vlajos/misspell_fixer
...
Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c
2014-11-23 14:33:43 -08:00
Anatol Belski
c6bad96f30
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master: (398 commits)
NEWS
add test for bug #68381
Fixed bug #68381 Set FPM log level earlier during init
proper dllexport
move to size_t where zend_string is used internally
fix some datatype mismatches
return after the warning, to fix uninitialized salt usage
fix datatype mismatches
add missing type specifier
fix datatype mismatches
fix unsigned check
"extern" shouldn't be used for definitions
joined identical conditional blocks
simplify fpm tests
SEND_VAR_NO_REF optimization
Add test for bug #68442
Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
Add new FPM test for IPv4/IPv6
...
Conflicts:
win32/build/config.w32
2014-11-18 21:18:52 +01:00
Anatol Belski
ed9ada5fa1
fix datatype mismatches
2014-10-31 19:36:23 +01:00
Anatol Belski
6498126afa
fix datatype mismatches
2014-10-31 19:36:22 +01:00
Anatol Belski
7f1107de91
converted ext/ereg, ext/phar and ext/pgsql for static tsrmls usage
2014-10-16 13:47:43 +02:00
Anatol Belski
c00424e427
bring back all the TSRMLS_FETCH() stuff
...
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
784f5bb6a2
cleaunp TSRMLS_FETCH in ext/pgsql
2014-09-26 21:19:28 +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
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5
Fixed useless or duplicated IS_INTERNED() checks
2014-09-19 15:41:01 +04:00
Anatol Belski
32c46f44a8
avoid strlen usage in the loop
2014-09-15 00:39:55 +02:00
Tjerk Meesters
18fa07e68f
Revert "Revert "Removing ext/ereg and dependencies""
...
This reverts commit 1981dd9c73
.
2014-09-11 19:25:42 +08:00
Dmitry Stogov
1981dd9c73
Revert "Removing ext/ereg and dependencies"
...
This reverts commit 86de7963fe
.
2014-09-11 11:06:57 +04:00
Tjerk Meesters
86de7963fe
Removing ext/ereg and dependencies
...
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')
SAPI:
- apache (header only)
- apache_hooks (header only)
2014-09-11 10:22:44 +08:00
Anatol Belski
a502639412
remove the expression parts, which are always true
2014-08-28 11:38:23 +02:00
Anatol Belski
e831de3024
fix some types and unnecessary casts
2014-08-28 11:38:22 +02:00
Anatol Belski
d2e416a90b
fix pg_last_notice()
2014-08-28 10:45:47 +02:00
Anatol Belski
ca0069bc33
fix remaining 's' args for pgsql
2014-08-28 00:21:12 +02:00
Anatol Belski
257ed4061a
's' works with size_t round 2
2014-08-27 20:49:33 +02: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