Xinchen Hui
e4ad9ed8ad
Return -1 seems bug here
2015-12-10 17:35:35 +08:00
Xinchen Hui
29b615cfcf
iFixed key leak with invalid resource
2015-12-10 15:02:01 +08:00
Michael Orlitzky
05f00e5060
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
...
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.
The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.
This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824 .
2015-12-09 11:37:50 +01:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Kalle Sommer Nielsen
27b83079fe
This shouldn't have been a part of the previous commit
2015-05-19 12:20:25 +02:00
Kalle Sommer Nielsen
dd527806e9
* Make ext/dba compile with newer versions of Oracle's Berkeley (in my case 6.1)
...
* Make the db3 driver work with 4.3+
2015-05-19 12:12:24 +02:00
Dmitry Stogov
bf7d3e0c23
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed typo
2015-04-08 15:54:47 +03:00
Dmitry Stogov
ec0b888a82
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed typo
2015-04-08 15:54:10 +03:00
Dmitry Stogov
1955403ed5
Fixed typo
2015-04-08 15:53:28 +03:00
Dmitry Stogov
fa348dcdfa
Fixed reference counting
2015-04-08 15:47:31 +03:00
Anatol Belski
ec89c85054
cleaning up the version macros
2015-03-23 20:13:59 +01:00
Xinchen Hui
c7b7cc4c16
Fixed build
2015-03-04 10:49:55 +08:00
Dmitry Stogov
2fa8d67a5c
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 02:05:28 +03:00
Xinchen Hui
5c87488a70
Ported dba
2015-02-03 12:07:36 +08:00
Joshua Rogers
c9b25859f0
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 15:11:25 +01:00
Julien Pauli
157508d87d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 15:09:34 +01:00
Joshua Rogers
df67c4e8bd
Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
2015-01-20 14:54:48 +01: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
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Veres Lajos
4b9535341a
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-19 20:23:00 +00:00
Anatol Belski
4b3e198023
removed *.dsw and *.dsp files
2014-09-28 19:02:09 +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
Nikita Popov
fca85d92cc
Fix ext/dba ini handling
...
Doing this change blindly based on gcov output
2014-09-11 16:06:31 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
b9c44ce85e
fixes to ext/dba
2014-08-19 11:28:42 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Xinchen Hui
f9c3d09f1c
Fixed tests but introduce segfaults (behavior same as trunk)
2014-05-21 23:11:02 +08:00
Xinchen Hui
96617874bd
Fixed persistent dba handling
2014-05-21 12:22:59 +08:00
Xinchen Hui
6d12d3bae1
Refactored ext/dba (tests passes, but segfaults need to be fixed)
2014-05-21 11:40:19 +08:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Nikita Popov
1aa6f95651
Merge branch 'PHP-5.6'
2014-02-16 00:08:17 +01:00
Rouven Weßling
417dbfbacc
Declare a number of functions as variadic.
2014-02-16 00:07:55 +01:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08: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
Michael Wallner
5a420c8680
fix bug #62490
...
inifiles delete handler did not return false if the key was not found
2013-12-05 11:04:25 +01:00
Michael Wallner
f0c85fab45
more test fixes
2013-12-03 18:18:40 +01:00
Michael Wallner
b0415856fd
fix test
2013-12-03 17:55:26 +01:00
Michael Wallner
9e309a2d10
fix php_stream_copy_to_stream_ex usage
2013-12-03 17:55:18 +01:00
Michael Wallner
a7f0465c0b
add missing clean section
2013-12-03 17:07:40 +01:00
Michael Wallner
f4912e3a96
remove test for already removed feature
2013-12-03 16:57:35 +01:00
