mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
87,903 Commits 500 Branches 1,381 Tags 796 MiB
52725009c7
Commit Graph

87903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikhil Vimal
52725009c7 Small Spacing adjustments for better reading 2015-02-07 10:30:07 -06:00
Anatol Belski
1c331d8d39 added ODBCVER to phpinfo() 2015-02-07 11:23:50 +01:00
Anatol Belski
be718e45b0 added PCRE JIT availability info to phpinfo() 
and a test to ensure it's enabled
 2015-02-07 11:04:53 +01:00
Xinchen Hui
594c220dea Fixed issue #1041 (Fix build in OSX with --enable-dtrace) 2015-02-07 11:27:42 +08:00
Anatol Belski
47af2381eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix setting default ODBCVER value in config.w32
 2015-02-06 20:00:26 +01:00
Anatol Belski
464667153d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix setting default ODBCVER value in config.w32
 2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291 fix setting default ODBCVER value in config.w32 2015-02-06 19:59:14 +01:00
Anatol Belski
0f9b686eb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
 2015-02-06 19:40:16 +01:00
Anatol Belski
e6d16c0956 updated NEWS 2015-02-06 19:39:32 +01:00
Anatol Belski
4266f5b1c4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2015-02-06 19:39:10 +01:00
Anatol Belski
f4319a4f73 updated NEWS 2015-02-06 19:37:01 +01:00
Anatol Belski
d0319e60b9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
 2015-02-06 19:05:43 +01:00
Anatol Belski
e46e208819 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
 2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759 Fixed bug #68964 Allowed memory size exhausted with odbc_exec 
This is done in two steps:

- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
  Server 9, otherwise the client will not recognize several SQL
  datatypes

- additionally the config scripts was tweaked so then ODBCVER
  can be overridden, that still allows enabling compatibility
  with lower versions

Bug #67437 might be fixed by this as well.
 2015-02-06 19:00:27 +01:00
Xinchen Hui
e033af4ed6 Update NEWS 2015-02-06 22:47:16 +08:00
Xinchen Hui
2bdf8d30b4 Merge branch 'master' of https://github.com/mabes/php-src 2015-02-06 22:43:11 +08:00
Xinchen Hui
3b3308a70a Further fix for bug #68987 2015-02-06 21:13:16 +08:00
Maxime BESSON
f384971552 Look for PDO include files in the right folder 
Configure scripts for extensions look for PDO include files in
$prefix/include/php. This change makes them look into $phpincludedir
instead, which may be different from $prefix/include/php.
 2015-02-06 12:06:29 +01:00
Dmitry Stogov
32bd6683d3 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  TSRMLS_* macros have been removed, user don't have to care about the change anymore
 2015-02-06 14:03:54 +03:00
Dmitry Stogov
da5439b9c8 Re-enable PCRE JIT disabled by b436c714c6 2015-02-06 14:02:15 +03:00
Reeze Xia
ff2cccbfdd TSRMLS_* macros have been removed, user don't have to care about the change anymore 2015-02-06 11:46:38 +01:00
Dmitry Stogov
bde6f5dbb5 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Upgrade pcre to 8.36
 2015-02-06 13:44:22 +03:00
Dmitry Stogov
57496c3836 This should fix compilation on OSX (bug #68987 Failed to compile zend.c with gcc-4.9.2) 2015-02-06 13:42:22 +03:00
Anatol Belski
20a194a92c Merge branch 'pull-request/1047' 2015-02-06 11:18:46 +01:00
Anatol Belski
fdfc0ccdf8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Removed erroneous condition
 2015-02-06 09:43:15 +01:00
Anatol Belski
63761ab91e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Removed erroneous condition
 2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b Removed erroneous condition 
This condition is always false. Furthermore headers_list() is
documented to always return an array.
 2015-02-06 09:41:02 +01:00
Stanislav Malyshev
624419bb71 Merge branch 'PHP-5.6' 
* PHP-5.6:
  turn off online tests, they fail too often on CI
  fix tests
  Update header handling to RFC 7230
 2015-02-05 22:06:27 -08:00
Stanislav Malyshev
af23980de7 turn off online tests, they fail too often on CI 2015-02-05 22:05:36 -08:00
Stanislav Malyshev
57ba83d4e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests
 2015-02-05 21:56:26 -08:00
Stanislav Malyshev
928fdbea08 fix tests 2015-02-05 21:54:47 -08:00
Stanislav Malyshev
93f0b8142b fix BC break in headers_list 2015-02-05 20:24:16 -08:00
Stanislav Malyshev
c3eac70c76 Update header handling to RFC 7230 2015-02-05 20:10:28 -08:00
Stanislav Malyshev
a1c28567c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update header handling to RFC 7230
 2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update header handling to RFC 7230
 2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073 Update header handling to RFC 7230 2015-02-05 20:08:12 -08:00
Xinchen Hui
e82e22e27b Opcache is enable by default 2015-02-05 17:07:30 +08:00
Xinchen Hui
a071fc4604 Added CREDITS 2015-02-05 16:58:19 +08:00
Stanislav Malyshev
d937517cb3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test to not hit php.net
  fix test to not hit php.net
 2015-02-05 00:42:21 -08:00
Stanislav Malyshev
e9822e090d fix test to not hit php.net 2015-02-05 00:42:11 -08:00
Stanislav Malyshev
2c386b55f2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test to not hit php.net
 2015-02-05 00:41:55 -08:00
Stanislav Malyshev
d33f4c6eb8 fix test to not hit php.net 2015-02-05 00:41:51 -08:00
Stanislav Malyshev
10b15f0f8b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Conflicts: 	main/streams/memory.c
 2015-02-05 00:41:35 -08:00
Xinchen Hui
e70c9f04ec Remove extra space 2015-02-05 16:33:45 +08:00
Xinchen Hui
7ed3e04569 Merge branch 'PHP-5.6' 2015-02-05 16:33:29 +08:00
Xinchen Hui
ae90010891 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/streams/memory.c
 2015-02-05 16:33:20 +08:00
Nayana Hettiarachchi
5446377c6b Conflicts: 
main/streams/memory.c
 2015-02-05 16:32:30 +08:00
Xinchen Hui
aa74a52985 We'd better not include this test script 2015-02-05 16:27:01 +08:00
Xinchen Hui
22a468dc71 return size_t 2015-02-05 16:26:38 +08:00
Xinchen Hui
8f6f32ffe4 Merge branch 'validate_null_pointer_on_php_stream_temp_write' of https://github.com/devzer01/php-src 2015-02-05 16:22:10 +08:00