Commit Graph
77268 Commits
Author SHA1 Message Date
Anatol Belski e881537089 integrated %pd into ext/spl 2013-12-05 13:28:22 +01:00
Anatol Belski 122805100a removed warnings in newly implemented pcre range cehcks 2013-12-05 12:38:11 +01:00
Anatol Belski 4d703a4225 added range check for pcre ini entries 2013-12-05 12:08:19 +01:00
Anatol Belski a0622d7c68 implemented %pd format for snprintf and spprintf
php_int_t var = 42;
php_printf("%pd", var);
2013-12-05 12:05:46 +01:00
Anatol Belski 42b1222754 Merge branch 'master' into str_size_and_int64 2013-12-05 08:37:37 +01:00
Adam Harvey de3b9bc77c Renumber the comments in php_request_shutdown() to be in order.
What, me OCD?
2013-12-04 14:29:45 -08:00
Andrey Hristov 0cb38a3d26 Merge branch 'master' of git.php.net:php-src
Conflicts:
	NEWS
2013-12-04 18:32:32 +02:00
Andrey Hristov 406d5a5ecc Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	UPGRADING
2013-12-04 16:20:03 +02:00
Anatol Belski 7228ac190a fixed ext/bcmath 2013-12-04 15:06:32 +01:00
Anatol Belski 3142989a14 finer fixes for ext/opcache 2013-12-04 14:07:27 +01:00
Anatol Belski 3930766e79 basic fixes to ext/opcache 2013-12-04 12:04:07 +01:00
Andrey Hristov 97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Andrey Hristov ceb1b7e20f Merge branch 'PHP-5.4' into PHP-5.5 2013-12-04 12:07:18 +02:00
Andrey Hristov 86aad97979 Fix loss of precision 2013-12-04 12:06:59 +02:00
Anatol Belski 55023a87b0 Merge branch 'master' into str_size_and_int64 2013-12-04 09:10:43 +01:00
Sara Golemon e51ddf9dc8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:40 -08:00
Sara Golemon df755deb45 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:12 -08:00
Sara Golemon 00a7b1ff7f Fix php_module_startup() when loading more than one additional module
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).

Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.

Fixes 63159
Thanks to @a-j-k
2013-12-03 18:20:19 -08:00
Adam Harvey 8f11f7f179 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:54:24 -08:00
Adam Harvey 44697c115b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:52:35 -08:00
Adam Harvey 6f52f566f3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey d1314893fd Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.

Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Anatol Belski 72e7a63485 basic fixes for ext/ldap 2013-12-03 22:43:37 +01:00
Anatol Belski c14d14e0d6 fix uninitialized variable 2013-12-03 22:03:11 +01:00
Anatol Belski fbb87ace85 basic fixes to ext/snmp 2013-12-03 21:31:55 +01:00
Anatol Belski fd6e5766ce basic fixes for ext/pdo_pgsql 2013-12-03 18:21:06 +01:00
Anatol Belski 8e11fa2251 basic fixes to ext/odbc 2013-12-03 16:54:15 +01:00
Anatol Belski 727d14b8dd basic fixes to ext/ftp 2013-12-03 12:09:12 +01:00
Anatol Belski b13e715581 basic fixes to ext/pdo_mysql 2013-12-03 11:44:18 +01:00
Anatol Belski 0ee45382cd basic fixes to ext/pdo_firebird 2013-12-03 11:18:12 +01:00
Anatol Belski 71be6bc5ec more fixes to ext/pdo and ext/pdo_pgsql 2013-12-03 10:52:55 +01:00
Sebastian Bergmann d1baf6c9d7 Leftover: Bump version to 5.7.0 2013-12-03 10:19:11 +01:00
Nikita Popov b3265e2108 Support gmp_remroot() on GMP 4.1 2013-12-03 10:19:10 +01:00
Anatol Belski e23b051be0 basic fixes to ext/pdo_pgsql 2013-12-03 09:53:22 +01:00
Anatol Belski 7193efebed basic fixes to ext/pdo_sqlite 2013-12-03 09:51:01 +01:00
Anatol Belski da7d62ea8a basic fixes for ext/pdo 2013-12-03 09:24:45 +01:00
Sebastian Bergmann 48cc47d55a Leftover: Bump version to 5.7.0 2013-12-03 07:42:37 +01:00
Anatol Belski 2fc14d515e some more fixes to ext/pgsql 2013-12-03 01:33:43 +01:00
Anatol Belski f7df15ea53 basic fixes for ext/pgsql 2013-12-02 21:10:33 +01:00
Nikita Popov a87233f98a Merge branch 'PHP-5.6' 2013-12-02 20:11:34 +01:00
Nikita Popov 00c74ccf69 Support gmp_remroot() on GMP 4.1 2013-12-02 20:11:06 +01:00
Bob Weinand 2d230254de Added note about const scalar exprs in UPGRADING file 2013-12-02 18:39:01 +01:00
Anatol Belski ce6945eb55 basic fixes to ext/shmop 2013-12-02 18:18:24 +01:00
Anatol Belski a68477f758 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-02 17:48:31 +01:00
Michael Wallner c23a1f78b4 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  Fix bug #65196
2013-12-02 17:03:30 +01:00
Michael Wallner f254476f99 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
  Fix bug #65196
2013-12-02 17:02:13 +01:00
Michael Wallner ffbb56685f BFN 2013-12-02 17:02:01 +01:00
Michael Wallner 9c0a70c1de Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65196
2013-12-02 17:01:25 +01:00
Michael Wallner 22fa3fbc5f Fix bug #65196
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
2013-12-02 17:00:13 +01:00
Michael Wallner 7cd702640d Fix Bug #64776 The XSLT extension is not thread safe. 2013-12-02 15:01:24 +01:00