Commit Graph
33593 Commits
Author SHA1 Message Date
Dmitry Stogov 1c462a4e4d Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 12:34:27 +01:00
Dmitry Stogov 9c5a902106 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:34:26 +01:00
Felipe Pena aaca4ede15 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-23 12:17:15 +01:00
Anatol Belski f2fc935502 next wave on semantical replacements long vs. int 2013-12-19 23:32:58 -08:00
Anatol Belski 98e273bb03 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/zip/php_zip.c
2013-12-19 22:18:18 +01:00
Boris Lytochkin ba51a375ae Merge branch '5.6'
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 00:47:26 +04:00
Boris Lytochkin 285c0bcec0 Merge branch '5.5' into 5.6
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:39:15 +04:00
Boris Lytochkin b65bd30e89 Merge branch '5.4' into 5.5
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:26:34 +04:00
Boris Lytochkin bb51d0e4c0 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations 2013-12-20 00:25:16 +04:00
Derick Rethans d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans e1a5edaac2 Merge branch 'PHP-5.5' 2013-12-19 18:58:48 +00:00
Derick Rethans 7a402ca51e Merge branch 'PHP-5.4' into PHP-5.5 2013-12-19 18:58:45 +00:00
Derick Rethans e881334e49 - Updated to version 2013.9 (2013i) 2013-12-19 18:58:44 +00:00
Anatol Belski 6125278290 more semantical replacements LONG vs. INT 2013-12-19 08:40:41 -08:00
Anatol Belski f58d0b35ed massive update semantical LONG vs INT replacements 2013-12-19 05:07:37 -08:00
Remi Collet e75b967610 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  save a few memory
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:56:25 +01:00
Remi Collet f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet 99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +01:00
Remi Collet 32d1d5fb59 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:53:50 +01:00
Remi Collet 20eb8e4d11 Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 2013-12-19 10:53:38 +01:00
Anatol Belski a981798d8e add missing header 2013-12-18 15:31:06 -08:00
Anatol Belski cfb76d53f7 correct fix for ext/opcache regarding zend_size_t replacements 2013-12-18 15:29:04 -08:00
Anatol Belski e9224fc81b reverted the previous wrong patch 2013-12-18 15:28:23 -08:00
Anatol Belski 5f3e76dfe5 fixes ext/opcache after too much replacement 2013-12-18 15:21:34 -08:00
Anatol Belski af362b20c6 zend_size_t for *.cpp files as well 2013-12-18 15:07:30 -08:00
Anatol Belski b1abe4ca21 mass replacement for zend_size_t/php_size_t 2013-12-18 14:46:44 -08:00
Anatol Belski df7db6519c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-18 17:07:00 +01:00
Bob Weinand b11b3d201f Fixed ZTS build. Needed to bump API version number. 2013-12-18 16:44:20 +01:00
Dmitry Stogov 26096aa73f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:22:05 +04:00
Dmitry Stogov 436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
2013-12-18 19:21:21 +04:00
Dmitry Stogov 16e95d9137 Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 2013-12-18 19:19:53 +04:00
Anatol Belski 8432557dcd Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend.h
	Zend/zend_execute.h
	Zend/zend_vm_execute.h
	main/SAPI.h
2013-12-18 15:07:42 +01:00
Kalle Sommer Nielsen aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen 2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true()
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Anatol Belski 9576330979 updated libmagic.patch 2013-12-17 13:30:17 -08:00
Anatol Belski 4cdcbeec76 basic fixes to ext/interbase 2013-12-17 11:17:12 +01:00
Anatol Belski 8aa7f84dd2 basic fixes to ext/sybase_ct 2013-12-17 10:58:13 +01:00
Anatol Belski 83edc59d13 fix datatype to hold read bytes 2013-12-17 10:20:34 +01:00
Anatol Belski dc45cfe401 fix function signature 2013-12-17 10:17:14 +01:00
Anatol Belski b90cc170b6 revamp ext/pdo_firebird 2013-12-17 10:14:55 +01:00
Anatol Belski 1337ba8a62 fixed conflicting function signatures in ext/com_dotnet 2013-12-17 10:06:11 +01:00
Anatol Belski 3e90132341 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_compile.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/opcache/Optimizer/pass1_5.c
	ext/pdo_odbc/odbc_stmt.c
2013-12-17 09:01:11 +01:00
Anatol Belski c0f1e6946d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed possibly uninitialized value usage
2013-12-17 08:45:49 +01:00
Anatol Belski beed28844b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01:00
Anatol Belski 5e5ecaea6e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed possibly uninitialized value usage
2013-12-17 08:45:07 +01:00
Anatol Belski 2303d0ea22 fixed possibly uninitialized value usage 2013-12-17 08:44:22 +01:00
Xinchen Hui a9c503bc27 Merge branch 'PHP-5.6' 2013-12-17 15:10:56 +08:00
Xinchen Hui eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00